From aac0b11742eb28e41ea70b478adeae769df036c5 Mon Sep 17 00:00:00 2001 From: Nindi Gill Date: Sun, 19 Nov 2023 19:31:47 +1100 Subject: [PATCH] SwiftFormat blankLinesBetweenScopes --- Mist/Model/Firmware.swift | 6 ++++++ Mist/Model/Hardware.swift | 2 ++ Mist/Model/Installer.swift | 16 ++++++++++++++++ Mist/Model/Package.swift | 1 + Mist/Views/Activity/ActivityView.swift | 2 ++ Mist/Views/ContentView.swift | 2 ++ Mist/Views/List/InstallerExportView.swift | 1 + Mist/Views/List/ListRowFirmware.swift | 1 + Mist/Views/List/ListRowInstaller.swift | 2 ++ Mist/Views/Refresh/RefreshView.swift | 1 + Mist/Views/Settings/SettingsAboutView.swift | 2 ++ .../Settings/SettingsGeneralHelperView.swift | 1 + MistHelperTool/main.swift | 1 + 13 files changed, 38 insertions(+) diff --git a/Mist/Model/Firmware.swift b/Mist/Model/Firmware.swift index f0b4681..28c8be8 100644 --- a/Mist/Model/Firmware.swift +++ b/Mist/Model/Firmware.swift @@ -47,6 +47,7 @@ struct Firmware: Decodable, Hashable, Identifiable { var id: String { "\(String.appIdentifier).\(version)-\(build)" } + var name: String { var name: String = "" @@ -65,6 +66,7 @@ struct Firmware: Decodable, Hashable, Identifiable { name = beta ? "\(name) beta" : name return name } + let version: String let build: String let shasum: String @@ -76,12 +78,15 @@ struct Firmware: Decodable, Hashable, Identifiable { var formattedDate: String { String(date.prefix(10)) } + var beta: Bool { build.range(of: "[a-z]$", options: .regularExpression) != nil } + var imageName: String { name.replacingOccurrences(of: " beta", with: "") } + var dictionary: [String: Any] { [ "name": name, @@ -95,6 +100,7 @@ struct Firmware: Decodable, Hashable, Identifiable { "beta": beta ] } + var tooltip: String { """ Release: \(name) diff --git a/Mist/Model/Hardware.swift b/Mist/Model/Hardware.swift index a4748b7..a15e6d8 100644 --- a/Mist/Model/Hardware.swift +++ b/Mist/Model/Hardware.swift @@ -24,6 +24,7 @@ struct Hardware { static var boardID: String? { architecture == .intel ? registryProperty(for: "board-id") : nil } + /// Hardware Device ID (Apple Silicon or Intel T2). static var deviceID: String? { switch architecture { @@ -35,6 +36,7 @@ struct Hardware { return nil } } + /// Hardware Model Identifier (Apple Silicon or Intel). static var modelIdentifier: String? { registryProperty(for: "model") diff --git a/Mist/Model/Installer.swift b/Mist/Model/Installer.swift index 366f4f2..c933914 100644 --- a/Mist/Model/Installer.swift +++ b/Mist/Model/Installer.swift @@ -688,6 +688,7 @@ struct Installer: Decodable, Hashable, Identifiable { name = beta ? "\(name) beta" : name return name } + var compatible: Bool { // Board ID (Intel) if let boardID: String = Hardware.boardID, @@ -722,18 +723,23 @@ struct Installer: Decodable, Hashable, Identifiable { return true } + var allDownloads: [Package] { (sierraOrOlder ? [] : [Package(url: distributionURL, size: distributionSize, integrityDataURL: nil, integrityDataSize: nil)]) + packages.sorted { $0.filename < $1.filename } } + var temporaryDiskImageMountPointURL: URL { URL(fileURLWithPath: "/Volumes/\(id)") } + var temporaryInstallerURL: URL { temporaryDiskImageMountPointURL.appendingPathComponent("Applications/Install \(name).app") } + var temporaryISOMountPointURL: URL { URL(fileURLWithPath: "/Volumes/Install \(name)") } + var dictionary: [String: Any] { [ "identifier": id, @@ -748,33 +754,43 @@ struct Installer: Decodable, Hashable, Identifiable { "beta": beta ] } + var mavericksOrNewer: Bool { bigSurOrNewer || version.range(of: "^10\\.(9|1[0-5])\\.", options: .regularExpression) != nil } + var sierraOrOlder: Bool { version.range(of: "^10\\.([7-9]|1[0-2])\\.", options: .regularExpression) != nil } + var catalinaOrNewer: Bool { bigSurOrNewer || version.range(of: "^10\\.15\\.", options: .regularExpression) != nil } + var bigSurOrNewer: Bool { version.range(of: "^1[1-9]\\.", options: .regularExpression) != nil } + var beta: Bool { build.range(of: "[a-z]$", options: .regularExpression) != nil } + var imageName: String { name.replacingOccurrences(of: " beta", with: "") } + var size: UInt64 { UInt64(packages.map { $0.size }.reduce(0, +)) } + var diskImageSize: Double { ceil(Double(size) / Double(UInt64.gigabyte)) + 1.5 } + var isoSize: Double { ceil(Double(size) / Double(UInt64.gigabyte)) + 1.5 } + var tooltip: String { """ Release: \(name) diff --git a/Mist/Model/Package.swift b/Mist/Model/Package.swift index 7c67c69..c587ff9 100644 --- a/Mist/Model/Package.swift +++ b/Mist/Model/Package.swift @@ -22,6 +22,7 @@ struct Package: Decodable, Hashable { var filename: String { url.components(separatedBy: "/").last ?? url } + var dictionary: [String: Any] { [ "url": url, diff --git a/Mist/Views/Activity/ActivityView.swift b/Mist/Views/Activity/ActivityView.swift index e63982f..87cbbd3 100644 --- a/Mist/Views/Activity/ActivityView.swift +++ b/Mist/Views/Activity/ActivityView.swift @@ -38,9 +38,11 @@ struct ActivityView: View { private var bootableInstaller: Bool { taskManager.taskGroups.map { $0.section }.contains(.bootableInstaller) } + private var venturaOrOlder: Bool { !ProcessInfo().isOperatingSystemAtLeast(OperatingSystemVersion(majorVersion: 14, minorVersion: 0, patchVersion: 0)) } + private var buttonText: String { switch taskManager.currentState { case .pending, .inProgress: diff --git a/Mist/Views/ContentView.swift b/Mist/Views/ContentView.swift index 1474fff..ff8d4a6 100644 --- a/Mist/Views/ContentView.swift +++ b/Mist/Views/ContentView.swift @@ -45,6 +45,7 @@ struct ContentView: View { return filteredFirmwares } + private var filteredInstallers: [Installer] { var filteredInstallers: [Installer] = installers @@ -68,6 +69,7 @@ struct ContentView: View { return filteredInstallers } + private let width: CGFloat = 480 private let height: CGFloat = 720 diff --git a/Mist/Views/List/InstallerExportView.swift b/Mist/Views/List/InstallerExportView.swift index 9494ae9..36d2a9b 100644 --- a/Mist/Views/List/InstallerExportView.swift +++ b/Mist/Views/List/InstallerExportView.swift @@ -25,6 +25,7 @@ struct InstallerExportView: View { return architecture == .intel || (architecture == .appleSilicon && installer.bigSurOrNewer) } + private var compatibilityMessage: String { "**Note:** ISOs are unavailable for building **macOS Catalina 10.15 and older** on [Apple Silicon Macs](https://support.apple.com/en-us/HT211814)." } diff --git a/Mist/Views/List/ListRowFirmware.swift b/Mist/Views/List/ListRowFirmware.swift index 2361a13..49fb6aa 100644 --- a/Mist/Views/List/ListRowFirmware.swift +++ b/Mist/Views/List/ListRowFirmware.swift @@ -34,6 +34,7 @@ struct ListRowFirmware: View { return "This macOS Firmware download cannot be used to restore macOS on this \(architecture.description) Mac.\n\nAre you sure you want to continue?" } + private var errorMessage: String { if let error: BlessError = error as? BlessError { return error.description diff --git a/Mist/Views/List/ListRowInstaller.swift b/Mist/Views/List/ListRowInstaller.swift index 5771787..9ff74e1 100644 --- a/Mist/Views/List/ListRowInstaller.swift +++ b/Mist/Views/List/ListRowInstaller.swift @@ -59,9 +59,11 @@ struct ListRowInstaller: View { return "This macOS Installer download cannot be used to restore macOS on this \(architecture.description) Mac.\n\nAre you sure you want to continue?" } + private var cacheDirectoryMessage: String { "The cache directory has incorrect ownership and/or permissions, which will cause issues caching macOS Installers.\n\nRepair the cache directory ownership and/or permissions and try again." } + private var errorMessage: String { if let error: BlessError = error as? BlessError { return error.description diff --git a/Mist/Views/Refresh/RefreshView.swift b/Mist/Views/Refresh/RefreshView.swift index b48f3c5..d7f3352 100644 --- a/Mist/Views/Refresh/RefreshView.swift +++ b/Mist/Views/Refresh/RefreshView.swift @@ -19,6 +19,7 @@ struct RefreshView: View { private var height: CGFloat { firmwaresState == .warning ? 230 : 200 } + private var buttonText: String { [.pending, .inProgress].contains(firmwaresState) || [.pending, .inProgress].contains(installersState) ? "Cancel" : "Close" } diff --git a/Mist/Views/Settings/SettingsAboutView.swift b/Mist/Views/Settings/SettingsAboutView.swift index 0890a5a..083f4d5 100644 --- a/Mist/Views/Settings/SettingsAboutView.swift +++ b/Mist/Views/Settings/SettingsAboutView.swift @@ -13,9 +13,11 @@ struct SettingsAboutView: View { private var version: String { Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "" } + private var build: String { Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "" } + private let length: CGFloat = 128 private let spacing: CGFloat = 3 diff --git a/Mist/Views/Settings/SettingsGeneralHelperView.swift b/Mist/Views/Settings/SettingsGeneralHelperView.swift index 524bbc2..5f6e40f 100644 --- a/Mist/Views/Settings/SettingsGeneralHelperView.swift +++ b/Mist/Views/Settings/SettingsGeneralHelperView.swift @@ -27,6 +27,7 @@ struct SettingsGeneralHelperView: View { let version: BundleVersion = installed.version return "Installed (\(version.major).\(version.minor).\(version.patch))" } + private var errorMessage: String { if let error: BlessError = error as? BlessError { return error.description diff --git a/MistHelperTool/main.swift b/MistHelperTool/main.swift index 64e92f0..9b94ca2 100644 --- a/MistHelperTool/main.swift +++ b/MistHelperTool/main.swift @@ -80,4 +80,5 @@ server.setErrorHandler { error in NSLog("error: \(error)") } } + server.startAndBlock()