morgan/macos-stats
1
0
Fork 0
mirror of https://github.com/morgan9e/macos-stats synced 2026-04-14 00:04:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: fixed swiftlint error that appears in the new version of swiftlint

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2024-10-18 16:44:03 +02:00
parent 359db0f0d0
commit 9ed4ee5749
10 changed files with 35 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Kit/helpers.swift
View File

@@ -819,11 +819,8 @@ public func process(path: String, arguments: [String]) -> String? {
}
let outputData = outputPipe.fileHandleForReading.readDataToEndOfFile()
let output = String(decoding: outputData, as: UTF8.self)
if output.isEmpty {
return nil
}
let output = String(data: outputData, encoding: .utf8)
guard let output, !output.isEmpty else { return nil }
return output
}

6
Kit/plugins/DB.swift
View File

@@ -76,15 +76,15 @@ public class DB {
public func insert(key: String, value: Codable, ts: Bool = true, force: Bool = false) {
self.values[key] = value
guard let blobData = try? JSONEncoder().encode(value) else { return }
guard let blobData = try? JSONEncoder().encode(value), let str = String(data: blobData, encoding: .utf8)else { return }
if ts {
self.lldb?.insert("\(key)@\(Date().currentTimeSeconds())", value: String(decoding: blobData, as: UTF8.self))
self.lldb?.insert("\(key)@\(Date().currentTimeSeconds())", value: str)
}
if !force, let ts = self.writeTS[key], (Date().timeIntervalSince1970-ts.timeIntervalSince1970) < 30 { return }
self.lldb?.insert(key, value: String(decoding: blobData, as: UTF8.self))
self.lldb?.insert(key, value: str)
self.writeTS[key] = Date()
}

4
Kit/plugins/Logger.swift
View File

@@ -73,13 +73,13 @@ public class NextLog {
let fileURL = fm.urls(for: .documentDirectory, in: .userDomainMask)[0].appendingPathComponent("log.txt")
if !fm.fileExists(atPath: fileURL.path) {
try? "".data(using: .utf8)?.write(to: fileURL)
try? Data("".utf8).write(to: fileURL)
}
do {
let handle = try FileHandle(forWritingTo: fileURL)
handle.seekToEndOfFile()
handle.write("----------------\n".data(using: .utf8)!)
handle.write(Data("----------------\n".utf8))
self.writer = FileHandlerOutputStream(handle)
} catch let err {
print("error to init file handler: \(err)")

2
Kit/plugins/Reachability.swift
View File

@@ -58,7 +58,7 @@ public class Reachability {
_ = unmanagedReachability.retain()
return UnsafeRawPointer(unmanagedReachability.toOpaque())
},
release: { (info: UnsafeRawPointer) -> Void in
release: { (info: UnsafeRawPointer) in
Unmanaged<Reachability>.fromOpaque(info).release()
},
copyDescription: nil

8
Modules/Battery/readers.swift
View File

@@ -194,13 +194,11 @@ public class ProcessReader: Reader<[TopProcess]> {
return
}
let output = String(decoding: outputData.advanced(by: outputData.count/2), as: UTF8.self)
if output.isEmpty {
return
}
let output = String(data: outputData.advanced(by: outputData.count/2), encoding: .utf8)
guard let output, !output.isEmpty else { return }
var processes: [TopProcess] = []
output.enumerateLines { (line, _) -> Void in
output.enumerateLines { (line, _) in
if line.matches("^\\d+ *[^(\\d)]*\\d+\\.*\\d* *$") {
let str = line.trimmingCharacters(in: .whitespaces)
let pidFind = str.findAndCrop(pattern: "^\\d+")

20
Modules/CPU/readers.swift
View File

@@ -212,16 +212,13 @@ public class ProcessReader: Reader<[TopProcess]> {
let outputData = outputPipe.fileHandleForReading.readDataToEndOfFile()
let errorData = errorPipe.fileHandleForReading.readDataToEndOfFile()
let output = String(decoding: outputData, as: UTF8.self)
_ = String(decoding: errorData, as: UTF8.self)
if output.isEmpty {
return
}
let output = String(data: outputData, encoding: .utf8)
_ = String(data: errorData, encoding: .utf8)
guard let output, !output.isEmpty else { return }
var index = 0
var processes: [TopProcess] = []
output.enumerateLines { (line, stop) -> Void in
output.enumerateLines { (line, stop) in
if index != 0 {
let str = line.trimmingCharacters(in: .whitespaces)
let pidFind = str.findAndCrop(pattern: "^\\d+")
@@ -472,10 +469,9 @@ public class LimitReader: Reader<CPU_Limit> {
}
let outputData = outputPipe.fileHandleForReading.readDataToEndOfFile()
var lines = String(decoding: outputData, as: UTF8.self).split(separator: "\n")
if lines.isEmpty {
return
}
guard let str = String(data: outputData, encoding: .utf8) else { return }
var lines = str.split(separator: "\n")
guard !lines.isEmpty else { return }
lines.removeFirst(3)
lines.forEach { (line: Substring) in
@@ -520,7 +516,7 @@ public class AverageReader: Reader<[Double]> {
}
let outputData = outputPipe.fileHandleForReading.readDataToEndOfFile()
guard let line = String(decoding: outputData, as: UTF8.self).split(separator: "\n").first else {
guard let raw = String(data: outputData, encoding: .utf8), let line = raw.split(separator: "\n").first else {
return
}

4
Modules/Disk/readers.swift
View File

@@ -384,7 +384,7 @@ public class ProcessReader: Reader<[Disk_process]> {
guard self.numberOfProcesses != 0, let output = runProcess(path: "/bin/ps", args: ["-Aceo pid,args", "-r"]) else { return }
var processes: [Disk_process] = []
output.enumerateLines { (line, _) -> Void in
output.enumerateLines { (line, _) in
let str = line.trimmingCharacters(in: .whitespaces)
let pidFind = str.findAndCrop(pattern: "^\\d+")
guard let pid = Int32(pidFind.cropped) else { return }
@@ -451,5 +451,5 @@ private func runProcess(path: String, args: [String] = []) -> String? {
}
let outputData = outputPipe.fileHandleForReading.readDataToEndOfFile()
return String(decoding: outputData, as: UTF8.self)
return String(data: outputData, encoding: .utf8)
}

22
Modules/Net/readers.swift
View File

@@ -271,17 +271,14 @@ internal class UsageReader: Reader<Network_Usage> {
let outputData = outputPipe.fileHandleForReading.readDataToEndOfFile()
let errorData = errorPipe.fileHandleForReading.readDataToEndOfFile()
let output = String(decoding: outputData, as: UTF8.self)
_ = String(decoding: errorData, as: UTF8.self)
if output.isEmpty {
return Bandwidth()
}
let output = String(data: outputData, encoding: .utf8)
_ = String(data: errorData, encoding: .utf8)
guard let output, !output.isEmpty else { return Bandwidth() }
var totalUpload: Int64 = 0
var totalDownload: Int64 = 0
var firstLine = false
output.enumerateLines { (line, _) -> Void in
output.enumerateLines { (line, _) in
if !firstLine {
firstLine = true
return
@@ -516,16 +513,13 @@ public class ProcessReader: Reader<[Network_Process]> {
let outputData = outputPipe.fileHandleForReading.readDataToEndOfFile()
let errorData = errorPipe.fileHandleForReading.readDataToEndOfFile()
let output = String(decoding: outputData, as: UTF8.self)
_ = String(decoding: errorData, as: UTF8.self)
if output.isEmpty {
return
}
let output = String(data: outputData, encoding: .utf8)
_ = String(data: errorData, encoding: .utf8)
guard let output, !output.isEmpty else { return }
var list: [Network_Process] = []
var firstLine = false
output.enumerateLines { (line, _) -> Void in
output.enumerateLines { (line, _) in
if !firstLine {
firstLine = true
return

11
Modules/RAM/readers.swift
View File

@@ -136,15 +136,12 @@ public class ProcessReader: Reader<[TopProcess]> {
let outputData = outputPipe.fileHandleForReading.readDataToEndOfFile()
let errorData = errorPipe.fileHandleForReading.readDataToEndOfFile()
let output = String(decoding: outputData, as: UTF8.self)
_ = String(decoding: errorData, as: UTF8.self)
if output.isEmpty {
return
}
let output = String(data: outputData, encoding: .utf8)
_ = String(data: errorData, encoding: .utf8)
guard let output, !output.isEmpty else { return }
var processes: [TopProcess] = []
output.enumerateLines { (line, _) -> Void in
output.enumerateLines { (line, _) in
if line.matches("^\\d+\\** +.* +\\d+[A-Z]*\\+?\\-? *$") {
processes.append(ProcessReader.parseProcess(line))
}

4
SMC/Helper/main.swift
View File

@@ -170,8 +170,8 @@ extension Helper {
let outputData = outputPipe.fileHandleForReading.readDataToEndOfFile()
let errorData = errorPipe.fileHandleForReading.readDataToEndOfFile()
let output = String(decoding: outputData, as: UTF8.self)
let error = String(decoding: errorData, as: UTF8.self)
let output = String(data: outputData, encoding: .utf8)
let error = String(data: errorData, encoding: .utf8)
return (output, error)
}