mirror of
https://github.com/ninxsoft/Mist.git
synced 2025-05-27 13:34:37 -04:00
Fix SwiftLint warnings
This commit is contained in:
parent
c63356ff40
commit
f53361cfc6
7 changed files with 14 additions and 25 deletions
|
@ -19,12 +19,12 @@ extension Sequence where Iterator.Element == [String: Any] {
|
||||||
|
|
||||||
func jsonString() throws -> String {
|
func jsonString() throws -> String {
|
||||||
let data: Data = try JSONSerialization.data(withJSONObject: self, options: [.prettyPrinted, .sortedKeys])
|
let data: Data = try JSONSerialization.data(withJSONObject: self, options: [.prettyPrinted, .sortedKeys])
|
||||||
return String(data: data, encoding: .utf8) ?? ""
|
return String(decoding: data, as: UTF8.self)
|
||||||
}
|
}
|
||||||
|
|
||||||
func propertyListString() throws -> String {
|
func propertyListString() throws -> String {
|
||||||
let data: Data = try PropertyListSerialization.data(fromPropertyList: self, format: .xml, options: .bitWidth)
|
let data: Data = try PropertyListSerialization.data(fromPropertyList: self, format: .xml, options: .bitWidth)
|
||||||
return String(data: data, encoding: .utf8) ?? ""
|
return String(decoding: data, as: UTF8.self)
|
||||||
}
|
}
|
||||||
|
|
||||||
func yamlString() throws -> String {
|
func yamlString() throws -> String {
|
||||||
|
|
|
@ -31,13 +31,8 @@ enum PropertyListUpdater {
|
||||||
}
|
}
|
||||||
|
|
||||||
propertyList[key] = value
|
propertyList[key] = value
|
||||||
|
|
||||||
data = try PropertyListSerialization.data(fromPropertyList: propertyList, format: .xml, options: .bitWidth)
|
data = try PropertyListSerialization.data(fromPropertyList: propertyList, format: .xml, options: .bitWidth)
|
||||||
|
let output: String = .init(decoding: data, as: UTF8.self)
|
||||||
guard let output = String(data: data, encoding: .utf8) else {
|
|
||||||
throw MistError.invalidData
|
|
||||||
}
|
|
||||||
|
|
||||||
try output.write(to: url, atomically: true, encoding: .utf8)
|
try output.write(to: url, atomically: true, encoding: .utf8)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -125,10 +125,9 @@ struct Firmware: Decodable, Hashable, Identifiable {
|
||||||
return []
|
return []
|
||||||
}
|
}
|
||||||
|
|
||||||
let string: String = try String(contentsOf: url)
|
let (data, _): (Data, URLResponse) = try await URLSession.shared.data(from: url)
|
||||||
|
|
||||||
guard
|
guard
|
||||||
let data: Data = string.data(using: .utf8),
|
|
||||||
let dictionary: [String: Any] = try JSONSerialization.jsonObject(with: data, options: .allowFragments) as? [String: Any],
|
let dictionary: [String: Any] = try JSONSerialization.jsonObject(with: data, options: .allowFragments) as? [String: Any],
|
||||||
let array: [[String: Any]] = dictionary["firmwares"] as? [[String: Any]] else {
|
let array: [[String: Any]] = dictionary["firmwares"] as? [[String: Any]] else {
|
||||||
return []
|
return []
|
||||||
|
|
|
@ -68,11 +68,11 @@ enum Hardware {
|
||||||
guard
|
guard
|
||||||
let dictionary: [String: Any] = nsDictionary as? [String: Any],
|
let dictionary: [String: Any] = nsDictionary as? [String: Any],
|
||||||
dictionary.keys.contains(key),
|
dictionary.keys.contains(key),
|
||||||
let data: Data = IORegistryEntryCreateCFProperty(entry, key as CFString, kCFAllocatorDefault, 0).takeRetainedValue() as? Data,
|
let data: Data = IORegistryEntryCreateCFProperty(entry, key as CFString, kCFAllocatorDefault, 0).takeRetainedValue() as? Data else {
|
||||||
let string: String = String(data: data, encoding: .utf8) else {
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let string: String = .init(decoding: data, as: UTF8.self)
|
||||||
return string.trimmingCharacters(in: CharacterSet(["\0"]))
|
return string.trimmingCharacters(in: CharacterSet(["\0"]))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -116,6 +116,7 @@ struct ActivityView: View {
|
||||||
title: Text("Are you sure you want to cancel?"),
|
title: Text("Are you sure you want to cancel?"),
|
||||||
message: Text("This process cannot be resumed once it has been cancelled."),
|
message: Text("This process cannot be resumed once it has been cancelled."),
|
||||||
primaryButton: .default(Text("Resume")),
|
primaryButton: .default(Text("Resume")),
|
||||||
|
// swiftlint:disable:next trailing_closure
|
||||||
secondaryButton: .destructive(Text("Cancel"), action: { cancel() })
|
secondaryButton: .destructive(Text("Cancel"), action: { cancel() })
|
||||||
)
|
)
|
||||||
case .error:
|
case .error:
|
||||||
|
|
|
@ -106,11 +106,9 @@ struct RefreshView: View {
|
||||||
throw MistError.invalidURL(Firmware.firmwaresURL)
|
throw MistError.invalidURL(Firmware.firmwaresURL)
|
||||||
}
|
}
|
||||||
|
|
||||||
let string: String = try String(contentsOf: firmwaresURL, encoding: .utf8)
|
let (data, _): (Data, URLResponse) = try await URLSession.shared.data(from: firmwaresURL)
|
||||||
|
|
||||||
guard
|
guard let dictionary: [String: Any] = try JSONSerialization.jsonObject(with: data, options: .allowFragments) as? [String: Any] else {
|
||||||
let data: Data = string.data(using: .utf8),
|
|
||||||
let dictionary: [String: Any] = try JSONSerialization.jsonObject(with: data, options: .allowFragments) as? [String: Any] else {
|
|
||||||
throw MistError.invalidData
|
throw MistError.invalidData
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -163,12 +161,7 @@ struct RefreshView: View {
|
||||||
}
|
}
|
||||||
|
|
||||||
do {
|
do {
|
||||||
let string: String = try String(contentsOf: url, encoding: .utf8)
|
let (data, _): (Data, URLResponse) = try await URLSession.shared.data(from: url)
|
||||||
|
|
||||||
guard let data: Data = string.data(using: .utf8) else {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
var format: PropertyListSerialization.PropertyListFormat = .xml
|
var format: PropertyListSerialization.PropertyListFormat = .xml
|
||||||
|
|
||||||
guard
|
guard
|
||||||
|
@ -257,7 +250,8 @@ struct RefreshView: View {
|
||||||
}
|
}
|
||||||
|
|
||||||
do {
|
do {
|
||||||
let string: String = try String(contentsOf: url, encoding: .utf8)
|
let (data, _): (Data, URLResponse) = try await URLSession.shared.data(from: url)
|
||||||
|
let string: String = .init(decoding: data, as: UTF8.self)
|
||||||
|
|
||||||
guard
|
guard
|
||||||
let name: String = nameFromDistribution(string),
|
let name: String = nameFromDistribution(string),
|
||||||
|
|
|
@ -51,9 +51,9 @@ class ShellExecutor: NSObject {
|
||||||
process.waitUntilExit()
|
process.waitUntilExit()
|
||||||
|
|
||||||
let outputData: Data = outputPipe.fileHandleForReading.readDataToEndOfFile()
|
let outputData: Data = outputPipe.fileHandleForReading.readDataToEndOfFile()
|
||||||
let standardOutput: String? = String(data: outputData, encoding: .utf8)
|
let standardOutput: String = .init(decoding: outputData, as: UTF8.self)
|
||||||
let errorData: Data = errorPipe.fileHandleForReading.readDataToEndOfFile()
|
let errorData: Data = errorPipe.fileHandleForReading.readDataToEndOfFile()
|
||||||
let standardError: String? = String(data: errorData, encoding: .utf8)
|
let standardError: String = .init(decoding: errorData, as: UTF8.self)
|
||||||
let terminationStatus: Int32 = process.terminationStatus
|
let terminationStatus: Int32 = process.terminationStatus
|
||||||
return HelperToolCommandResponse(terminationStatus: terminationStatus, standardOutput: standardOutput, standardError: standardError)
|
return HelperToolCommandResponse(terminationStatus: terminationStatus, standardOutput: standardOutput, standardError: standardError)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue