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 findAndCrop function that returns wrong remaining string after crop (#1725)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2023-12-16 12:41:53 +01:00
parent 764c04b8c8
commit fb4f57e0ae
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Kit/extensions.swift
View File

@@ -42,11 +42,10 @@ extension String: LocalizedError {
let range = NSRange(self.startIndex..., in: self)
if let match = regex.firstMatch(in: self, options: [], range: range) {
let matchRange = Range(match.range, in: self)
if let range = matchRange {
let croppedString = String(self[range])
let remainingString = String(self[range.upperBound...])
return (croppedString.trimmingCharacters(in: .whitespaces), remainingString.trimmingCharacters(in: .whitespaces))
if let range = Range(match.range, in: self) {
let cropped = String(self[range]).trimmingCharacters(in: .whitespaces)
let remaining = self.replacingOccurrences(of: cropped, with: "", options: .regularExpression).trimmingCharacters(in: .whitespaces)
return (cropped, remaining)
}
}
} catch {

5
Modules/CPU/main.swift
View File

@@ -51,7 +51,6 @@ public class CPU: Module {
private var frequencyReader: FrequencyReader? = nil
private var limitReader: LimitReader? = nil
private var averageReader: AverageReader? = nil
private var powermetricsReader: PowermetricsReader? = nil
private var usagePerCoreState: Bool {
Store.shared.bool(key: "\(self.config.name)_usagePerCore", defaultValue: false)
@@ -114,7 +113,6 @@ public class CPU: Module {
self.processReader = ProcessReader(.CPU)
self.averageReader = AverageReader(.CPU, popup: true)
self.temperatureReader = TemperatureReader(.CPU, popup: true)
self.powermetricsReader = PowermetricsReader(.CPU, popup: true)
#if arch(x86_64)
self.limitReader = LimitReader(.CPU, popup: true)
@@ -195,9 +193,6 @@ public class CPU: Module {
if let reader = self.averageReader {
self.addReader(reader)
}
if let reader = self.powermetricsReader {
self.addReader(reader)
}
}
private func loadCallback(_ raw: CPU_Load?) {