SwiftFormat indent

This commit is contained in:
Nindi Gill 2023-11-19 19:48:05 +11:00
parent ab68a45ac5
commit e415751f7e
No known key found for this signature in database
GPG key ID: FF9A7FD590D4F4B1
6 changed files with 30 additions and 30 deletions

View file

@ -19,9 +19,9 @@ extension FileManager {
guard guard
let enumerator: FileManager.DirectoryEnumerator = enumerator(at: url, includingPropertiesForKeys: Array(urlResourceKeys), options: [], errorHandler: { _, error -> Bool in let enumerator: FileManager.DirectoryEnumerator = enumerator(at: url, includingPropertiesForKeys: Array(urlResourceKeys), options: [], errorHandler: { _, error -> Bool in
enumeratorError = error enumeratorError = error
return false return false
}) else { }) else {
return 0 return 0
} }

View file

@ -41,15 +41,15 @@ extension URL {
while while
try autoreleasepool(invoking: { try autoreleasepool(invoking: {
try Task.checkCancellation() try Task.checkCancellation()
let data: Data = fileHandle.readData(ofLength: length) let data: Data = fileHandle.readData(ofLength: length)
if !data.isEmpty { if !data.isEmpty {
shasum.update(data: data) shasum.update(data: data)
} }
return !data.isEmpty return !data.isEmpty
}) {} }) {}
let data: Data = .init(shasum.finalize()) let data: Data = .init(shasum.finalize())
return data.map { String(format: "%02hhx", $0) }.joined() return data.map { String(format: "%02hhx", $0) }.joined()

View file

@ -29,9 +29,9 @@ struct ContentView: View {
let string: String = searchString.lowercased() let string: String = searchString.lowercased()
filteredFirmwares = filteredFirmwares.filter { filteredFirmwares = filteredFirmwares.filter {
$0.name.lowercased().contains(string) || $0.name.lowercased().contains(string) ||
$0.version.lowercased().contains(string) || $0.version.lowercased().contains(string) ||
$0.build.lowercased().contains(string) || $0.build.lowercased().contains(string) ||
$0.formattedDate.lowercased().contains(string) $0.formattedDate.lowercased().contains(string)
} }
} }
@ -53,9 +53,9 @@ struct ContentView: View {
let string: String = searchString.lowercased() let string: String = searchString.lowercased()
filteredInstallers = filteredInstallers.filter { filteredInstallers = filteredInstallers.filter {
$0.name.lowercased().contains(string) || $0.name.lowercased().contains(string) ||
$0.version.lowercased().contains(string) || $0.version.lowercased().contains(string) ||
$0.build.lowercased().contains(string) || $0.build.lowercased().contains(string) ||
$0.date.lowercased().contains(string) $0.date.lowercased().contains(string)
} }
} }

View file

@ -147,8 +147,8 @@ struct RefreshView: View {
firmwares.sort { firmwares.sort {
$0.version == $1.version ? $0.version == $1.version ?
($0.build.count == $1.build.count ? $0.build > $1.build : $0.build.count > $1.build.count) : ($0.build.count == $1.build.count ? $0.build > $1.build : $0.build.count > $1.build.count) :
$0.version > $1.version $0.version > $1.version
} }
return firmwares return firmwares
} }
@ -186,8 +186,8 @@ struct RefreshView: View {
installers.append(contentsOf: Installer.legacyInstallers) installers.append(contentsOf: Installer.legacyInstallers)
installers.sort { installers.sort {
$0.version == $1.version ? $0.version == $1.version ?
($0.build.count == $1.build.count ? $0.build > $1.build : $0.build.count > $1.build.count) : ($0.build.count == $1.build.count ? $0.build > $1.build : $0.build.count > $1.build.count) :
$0.version.compare($1.version, options: .numeric) == .orderedDescending $0.version.compare($1.version, options: .numeric) == .orderedDescending
} }
guard !installers.isEmpty else { guard !installers.isEmpty else {

View file

@ -134,8 +134,8 @@ struct SettingsInstallersCacheView: View {
self.installers = installers.sorted { self.installers = installers.sorted {
$0.version == $1.version ? $0.version == $1.version ?
($0.build.count == $1.build.count ? $0.build > $1.build : $0.build.count > $1.build.count) : ($0.build.count == $1.build.count ? $0.build > $1.build : $0.build.count > $1.build.count) :
$0.version.compare($1.version, options: .numeric) == .orderedDescending $0.version.compare($1.version, options: .numeric) == .orderedDescending
} }
selectedInstallerId = nil selectedInstallerId = nil
} catch { } catch {

View file

@ -14,21 +14,21 @@ struct SettingsView: View {
var body: some View { var body: some View {
TabView { TabView {
SettingsGeneralView(sparkleUpdater: sparkleUpdater) SettingsGeneralView(sparkleUpdater: sparkleUpdater)
.tabItem { Label("General", systemImage: "gear") } .tabItem { Label("General", systemImage: "gear") }
SettingsFirmwaresView() SettingsFirmwaresView()
.tabItem { Label("Firmwares", systemImage: "memorychip") } .tabItem { Label("Firmwares", systemImage: "memorychip") }
SettingsInstallersView() SettingsInstallersView()
.tabItem { Label("Installers", systemImage: "desktopcomputer.and.arrow.down") } .tabItem { Label("Installers", systemImage: "desktopcomputer.and.arrow.down") }
SettingsApplicationsView() SettingsApplicationsView()
.tabItem { Label("Applications", systemImage: "macwindow") } .tabItem { Label("Applications", systemImage: "macwindow") }
SettingsDiskImagesView() SettingsDiskImagesView()
.tabItem { Label("Disk Images", systemImage: "opticaldiscdrive") } .tabItem { Label("Disk Images", systemImage: "opticaldiscdrive") }
SettingsISOsView() SettingsISOsView()
.tabItem { Label("ISOs", systemImage: "opticaldisc") } .tabItem { Label("ISOs", systemImage: "opticaldisc") }
SettingsPackagesView() SettingsPackagesView()
.tabItem { Label("Packages", systemImage: "shippingbox") } .tabItem { Label("Packages", systemImage: "shippingbox") }
SettingsAboutView() SettingsAboutView()
.tabItem { Label("About", systemImage: "info.circle") } .tabItem { Label("About", systemImage: "info.circle") }
} }
.frame(width: width) .frame(width: width)
} }