Yueoaix · tomlee130 · Aug 27, 2020 · Aug 27, 2020 · Sep 29, 2020
diff --git a/SymbolicatorX/SymbolicatorX.xcodeproj/project.pbxproj b/SymbolicatorX/SymbolicatorX.xcodeproj/project.pbxproj
diff --git a/SymbolicatorX/SymbolicatorX/Adaptor/Plist/PlistArray.swift b/SymbolicatorX/SymbolicatorX/Adaptor/Plist/PlistArray.swift
@@ -99,3 +99,9 @@ public extension Plist {
         return PlistArray(plist: self)
     }
 }
+
+extension Array where Element : Hashable {
+    var unique: [Element] {
+        return Array(Set(self))
+    }
+}
diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/afc.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/afc.h
@@ -28,8 +28,8 @@
 extern "C" {
 #endif
 
-#include <libimobiledevice/libimobiledevice.h>
-#include <libimobiledevice/lockdown.h>
+#include "libimobiledevice.h"
+#include "lockdown.h"
 
 #define AFC_SERVICE_NAME "com.apple.afc"
 

diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/companion_proxy.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/companion_proxy.h
@@ -27,8 +27,8 @@
 extern "C" {
 #endif
 
-#include <libimobiledevice/libimobiledevice.h>
-#include <libimobiledevice/lockdown.h>
+#include "libimobiledevice.h"
+#include "lockdown.h"
 
 #define COMPANION_PROXY_SERVICE_NAME "com.apple.companion_proxy"
 

diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/debugserver.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/debugserver.h
@@ -27,8 +27,8 @@
 extern "C" {
 #endif
 
-#include <libimobiledevice/libimobiledevice.h>
-#include <libimobiledevice/lockdown.h>
+#include <libmobiledevice/libimobiledevice.h>
+#include <libmobiledevice/lockdown.h>
 
 #define DEBUGSERVER_SERVICE_NAME "com.apple.debugserver"
 

diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/diagnostics_relay.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/diagnostics_relay.h
@@ -27,8 +27,8 @@
 extern "C" {
 #endif
 
-#include <libimobiledevice/libimobiledevice.h>
-#include <libimobiledevice/lockdown.h>
+#include "libimobiledevice.h"
+#include "lockdown.h"
 
 #define DIAGNOSTICS_RELAY_SERVICE_NAME "com.apple.mobile.diagnostics_relay"
 

diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/file_relay.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/file_relay.h
@@ -29,8 +29,8 @@
 extern "C" {
 #endif
 
-#include <libimobiledevice/libimobiledevice.h>
-#include <libimobiledevice/lockdown.h>
+#include "libimobiledevice.h"
+#include "lockdown.h"
 
 #define FILE_RELAY_SERVICE_NAME "com.apple.mobile.file_relay"
 

diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/heartbeat.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/heartbeat.h
@@ -27,8 +27,8 @@
 extern "C" {
 #endif
 
-#include <libimobiledevice/libimobiledevice.h>
-#include <libimobiledevice/lockdown.h>
+#include "libimobiledevice.h"
+#include "lockdown.h"
 
 #define HEARTBEAT_SERVICE_NAME "com.apple.mobile.heartbeat"
 

diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/house_arrest.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/house_arrest.h
@@ -28,9 +28,9 @@
 extern "C" {
 #endif
 
-#include <libimobiledevice/libimobiledevice.h>
-#include <libimobiledevice/lockdown.h>
-#include <libimobiledevice/afc.h>
+#include "libimobiledevice.h"
+#include "lockdown.h"
+#include "afc.h"
 
 #define HOUSE_ARREST_SERVICE_NAME "com.apple.mobile.house_arrest"
 

diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/installation_proxy.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/installation_proxy.h
@@ -30,8 +30,8 @@
 extern "C" {
 #endif
 
-#include <libimobiledevice/libimobiledevice.h>
-#include <libimobiledevice/lockdown.h>
+#include "libimobiledevice.h"
+#include "lockdown.h"
 
 #define INSTPROXY_SERVICE_NAME "com.apple.mobile.installation_proxy"
 

diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/libimobiledevice.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/libimobiledevice.h
@@ -33,7 +33,7 @@ extern "C" {
 #include <stdint.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <plist/plist.h>
+#include <libplist/plist.h>
 
 /** Error Codes */
 typedef enum {

diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/lockdown.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/lockdown.h
@@ -30,8 +30,8 @@
 extern "C" {
 #endif
 
-#include <libimobiledevice/libimobiledevice.h>
-#include <libimobiledevice/lockdown.h>
+#include <libmobiledevice/libimobiledevice.h>
+#include <libmobiledevice/lockdown.h>
 
 /** Error Codes */
 typedef enum {

diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/misagent.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/misagent.h
@@ -28,8 +28,8 @@
 extern "C" {
 #endif
 
-#include <libimobiledevice/libimobiledevice.h>
-#include <libimobiledevice/lockdown.h>
+#include "libimobiledevice.h"
+#include "lockdown.h"
 
 #define MISAGENT_SERVICE_NAME "com.apple.misagent"
 

diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/mobile_image_mounter.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/mobile_image_mounter.h
@@ -28,8 +28,8 @@
 extern "C" {
 #endif
 
-#include <libimobiledevice/libimobiledevice.h>
-#include <libimobiledevice/lockdown.h>
+#include "libimobiledevice.h"
+#include "lockdown.h"
 
 #define MOBILE_IMAGE_MOUNTER_SERVICE_NAME "com.apple.mobile.mobile_image_mounter"
 

diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/mobileactivation.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/mobileactivation.h
@@ -27,8 +27,8 @@
 extern "C" {
 #endif
 
-#include <libimobiledevice/libimobiledevice.h>
-#include <libimobiledevice/lockdown.h>
+#include "libimobiledevice.h"
+#include "lockdown.h"
 
 #define MOBILEACTIVATION_SERVICE_NAME "com.apple.mobileactivationd"
 

diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/mobilebackup.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/mobilebackup.h
@@ -28,8 +28,8 @@
 extern "C" {
 #endif
 
-#include <libimobiledevice/libimobiledevice.h>
-#include <libimobiledevice/lockdown.h>
+#include "libimobiledevice.h"
+#include "lockdown.h"
 
 #define MOBILEBACKUP_SERVICE_NAME "com.apple.mobilebackup"
 

diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/mobilebackup2.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/mobilebackup2.h
@@ -28,8 +28,8 @@
 extern "C" {
 #endif
 
-#include <libimobiledevice/libimobiledevice.h>
-#include <libimobiledevice/lockdown.h>
+#include "libimobiledevice.h"
+#include "lockdown.h"
 
 #define MOBILEBACKUP2_SERVICE_NAME "com.apple.mobilebackup2"
 

diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/mobilesync.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/mobilesync.h
@@ -31,8 +31,8 @@
 extern "C" {
 #endif
 
-#include <libimobiledevice/libimobiledevice.h>
-#include <libimobiledevice/lockdown.h>
+#include "libimobiledevice.h"
+#include "lockdown.h"
 
 #define MOBILESYNC_SERVICE_NAME "com.apple.mobilesync"
 

diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/notification_proxy.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/notification_proxy.h
@@ -28,8 +28,8 @@
 extern "C" {
 #endif
 
-#include <libimobiledevice/libimobiledevice.h>
-#include <libimobiledevice/lockdown.h>
+#include "libimobiledevice.h"
+#include "lockdown.h"
 
 #define NP_SERVICE_NAME "com.apple.mobile.notification_proxy"
 

diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/preboard.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/preboard.h
@@ -27,8 +27,8 @@
 extern "C" {
 #endif
 
-#include <libimobiledevice/libimobiledevice.h>
-#include <libimobiledevice/lockdown.h>
+#include "libimobiledevice.h"
+#include "lockdown.h"
 
 #define PREBOARD_SERVICE_NAME "com.apple.preboardservice_v2"
 

diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/property_list_service.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/property_list_service.h
@@ -28,7 +28,7 @@
 extern "C" {
 #endif
 
-#include <libimobiledevice/lockdown.h>
+#include "lockdown.h"
 
 /* Error Codes */
 typedef enum {

diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/restore.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/restore.h
@@ -29,7 +29,7 @@
 extern "C" {
 #endif
 
-#include <libimobiledevice/libimobiledevice.h>
+#include "libimobiledevice.h"
 
 /** Error Codes */
 typedef enum {

diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/sbservices.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/sbservices.h
@@ -28,8 +28,8 @@
 extern "C" {
 #endif
 
-#include <libimobiledevice/libimobiledevice.h>
-#include <libimobiledevice/lockdown.h>
+#include "libimobiledevice.h"
+#include "lockdown.h"
 
 #define SBSERVICES_SERVICE_NAME "com.apple.springboardservices"
 

diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/screenshotr.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/screenshotr.h
@@ -29,8 +29,8 @@
 extern "C" {
 #endif
 
-#include <libimobiledevice/libimobiledevice.h>
-#include <libimobiledevice/lockdown.h>
+#include "libimobiledevice.h"
+#include "lockdown.h"
 
 #define SCREENSHOTR_SERVICE_NAME "com.apple.mobile.screenshotr"
 

diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/service.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/service.h
@@ -27,8 +27,8 @@
 extern "C" {
 #endif
 
-#include <libimobiledevice/libimobiledevice.h>
-#include <libimobiledevice/lockdown.h>
+#include "libimobiledevice.h"
+#include "lockdown.h"
 
 /** Error Codes */
 typedef enum {

diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/syslog_relay.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/syslog_relay.h
@@ -28,8 +28,8 @@
 extern "C" {
 #endif
 
-#include <libimobiledevice/libimobiledevice.h>
-#include <libimobiledevice/lockdown.h>
+#include "libimobiledevice.h"
+#include "lockdown.h"
 
 #define SYSLOG_RELAY_SERVICE_NAME "com.apple.syslog_relay"
 

diff --git a/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/webinspector.h b/SymbolicatorX/SymbolicatorX/Devicelib/libimobiledevice/webinspector.h
@@ -28,8 +28,8 @@
 extern "C" {
 #endif
 
-#include <libimobiledevice/libimobiledevice.h>
-#include <libimobiledevice/lockdown.h>
+#include "libimobiledevice.h"
+#include "lockdown.h"
 
 #define WEBINSPECTOR_SERVICE_NAME "com.apple.webinspector"
 

diff --git a/SymbolicatorX/SymbolicatorX/Main/Controller/MainViewController.swift b/SymbolicatorX/SymbolicatorX/Main/Controller/MainViewController.swift
@@ -3,10 +3,12 @@
 //  SymbolicatorX
 //
 //  Created by 钟晓跃 on 2020/7/5.
-//  Copyright © 2020 钟晓跃. All rights reserved.
+//  Modify by 钟晓跃 on 2020/7/5.
+//  Copyright © 2020 lory. All rights reserved.
 //
 
 import Cocoa
+import libSymbolicatorX
 
 class MainViewController: BaseViewController {
 
@@ -62,7 +64,12 @@ extension MainViewController {
 
         isSymbolicating = true
 
-        Symbolicator.symbolicate(crashFile: crashFile, dsymFile: dsymFile, errorHandler: { [weak self] (error) in
+        print(crashFile.path?.absoluteString)
+        print(dsymFile.path.absoluteString)
+
+        guard let cf = libSymbolicatorX.LibCrashFile(path: crashFile.path!) else { return }
+        let df = libSymbolicatorX.LibDSYMFile(path: dsymFile.path)
+        libSymbolicatorX.symbolicate(crashFile: cf, dsymFile: df, errorHandler: { [weak self] (error) in
 
             DispatchQueue.main.async {
                 self?.view.window?.alert(message: error)
@@ -78,6 +85,23 @@ extension MainViewController {
                 self?.textWindowController.saveUrl = crashFile.symbolicatedContentSaveURL
             }
         }
+
+//        Symbolicator.symbolicate(crashFile: crashFile, dsymFile: dsymFile, errorHandler: { [weak self] (error) in
+//
+//            DispatchQueue.main.async {
+//                self?.view.window?.alert(message: error)
+//                self?.isSymbolicating = false
+//            }
+//        }) { [weak self] (content) in
+//
+//            DispatchQueue.main.async {
+//                self?.isSymbolicating = false
+//                self?.textWindowController.showWindow(nil)
+//                self?.textWindowController.fileName = crashFile.filename
+//                self?.textWindowController.text = content
+//                self?.textWindowController.saveUrl = crashFile.symbolicatedContentSaveURL
+//            }
+//        }
     }
 }
 

diff --git a/SymbolicatorX/SymbolicatorX/Main/Model/CrashFile.swift b/SymbolicatorX/SymbolicatorX/Main/Model/CrashFile.swift
@@ -25,6 +25,7 @@ public struct CrashFile {
     var architecture: Architecture?
     var loadAddress: String?
     var addresses: [String]?
+    var addressArray = [String:[String]]()
     var version: String?
     var buildVersion: String?
     var uuid: BinaryUUID?
@@ -138,6 +139,19 @@ public struct CrashFile {
 
         self.addresses = crashReportAddresses + sampleAddresses
 
+        let crashReportBinaries = content.scan(
+            pattern: "^\\d+\\s+(\("[a-zA-Z0-9_\\u4e00-\\u9fa5]*")).*?0x.*?\\s",
+            options: [.caseInsensitive, .anchorsMatchLines, .dotMatchesLineSeparators]
+        ).compactMap { $0.last }
+
+        crashReportBinaries.unique.forEach { (binary) in
+            let crashReportAddresses = content.scan(
+                pattern: "^\\d+\\s+(\(binary)).*?(0x.*?)\\s",
+                options: [.caseInsensitive, .anchorsMatchLines, .dotMatchesLineSeparators]
+            ).compactMap { $0.last }
+            self.addressArray[binary] = crashReportAddresses
+        }
+
         self.responsible = content.scan(pattern: "^Responsible:\\s+(.+?)\\[").first?.first?.trimmed
         self.version = content.scan(pattern: "^Version:\\s+(.+?)\\(").first?.first?.trimmed
         self.buildVersion = content.scan(pattern: "^Version:.+\\((.*?)\\)").first?.first?.trimmed

diff --git a/SymbolicatorX/SymbolicatorX/Main/Model/DSYMFile.swift b/SymbolicatorX/SymbolicatorX/Main/Model/DSYMFile.swift
@@ -23,6 +23,17 @@ public struct DSYMFile {
 
         return dwarfPath.appendingPathComponent(binary).path
     }
+
+    var binaryName: String {
+
+        let dwarfPath = path.appendingPathComponent("Contents").appendingPathComponent("Resources").appendingPathComponent("DWARF")
+
+        guard let binary = (try? FileManager.default.contentsOfDirectory(atPath: dwarfPath.path))?.first else {
+            return filename.replacingOccurrences(of: ".dSYM", with: "")
+        }
+
+        return binary
+    }
 
     public init(path: URL) {
 

diff --git a/SymbolicatorX/SymbolicatorX/Tools/Symbolicator/Symbolicator.swift b/SymbolicatorX/SymbolicatorX/Tools/Symbolicator/Symbolicator.swift
@@ -27,7 +27,7 @@ class Symbolicator {
                 return
             }
 
-            guard let addresses = crashFile.addresses, addresses.count > 0 else {
+            guard let addresses = crashFile.addressArray[dsymFile.binaryName], addresses.count > 0 else {
                 completion(crashFile.content)
                 return
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ class Symbolicator { @@
                     return
                 }
-                guard let addresses = crashFile.addresses, addresses.count > 0 else {
+                guard let addresses = crashFile.addressArray[dsymFile.binaryName], addresses.count > 0 else {
                     completion(crashFile.content)
                     return
                 }
@@ Expand Down @@