Cleanup process name matching

inket · Aug 26, 2024 · f528e8f · f528e8f
1 parent afb31b6
commit f528e8f
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/MacSymbolicator/Models/ReportProcess.swift b/MacSymbolicator/Models/ReportProcess.swift
@@ -32,20 +32,23 @@ public class ReportProcess {
 
         return processSections.compactMap {
             guard let match = $0.first else { return nil }
-            return ReportProcess(parsing: match, targetProcess: targetProcess)
-        }
-    }
 
-    init?(parsing content: String, targetProcess: String?) {
-        name = content.scan(pattern: Self.processNameRegex).first?.first
-        if (name == nil) {
-            return nil;
-        }
-        if (!(targetProcess ?? "").isEmpty) {
-            if (!name!.contains(targetProcess!)) {
-                return nil;
+            let processName = match.scan(pattern: Self.processNameRegex).first?.first
+
+            if let targetProcess {
+                if let processName, processName.contains(targetProcess) {
+                    return ReportProcess(name: processName, parsing: match)
+                } else {
+                    return nil
+                }
+            } else {
+                return ReportProcess(name: processName, parsing: match)
             }
         }
+    }
+
+    init?(name: String?, parsing content: String) {
+        self.name = name
         architecture = Architecture.find(in: content)
         binaryImages = BinaryImage.find(in: content)
         frames = StackFrame.find(