From fb4f57e0ae9ce372df3441a732f38061c5ad0569 Mon Sep 17 00:00:00 2001
From: Serhiy Mytrovtsiy <mitrovtsiy@ukr.net>
Date: Sat, 16 Dec 2023 12:41:53 +0100
Subject: [PATCH] fix: fixed findAndCrop function that returns wrong remaining
 string after crop (#1725)

---
 Kit/extensions.swift   | 9 ++++-----
 Modules/CPU/main.swift | 5 -----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Kit/extensions.swift b/Kit/extensions.swift
index 4bb6e87a..01033580 100644
--- a/Kit/extensions.swift
+++ b/Kit/extensions.swift
@@ -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 {
diff --git a/Modules/CPU/main.swift b/Modules/CPU/main.swift
index 9015c464..b9a78604 100644
--- a/Modules/CPU/main.swift
+++ b/Modules/CPU/main.swift
@@ -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?) {