feat: re-enable all

Signed-off-by: 82Flex <[email protected]>

Author: Lessica

TrollFools/CLI/CmdInject.swift

@@ -52,6 +52,6 @@ struct CmdInject: ParsableCommand {
         }
         injector.useWeakReference = weakReference
         injector.injectStrategy = fastInjection ? .fast : .lexicographic
-        try injector.inject(pluginURLs)
+        try injector.inject(pluginURLs, shouldPersist: false)
     }
 }

TrollFools/EjectListView.swift

@@ -149,6 +149,10 @@ struct EjectListView: View {
         .navigationTitle(NSLocalizedString("Plug-Ins", comment: ""))
         .animation(.easeOut, value: combines(
             ejectList.filter,
+            ejectList.isOkToEnableAll,
+            ejectList.isOkToDisableAll,
+            isEnablingAll,
+            isDisablingAll,
             isDeletingAll
         ))
         .background(Group {
@@ -334,7 +338,76 @@ struct EjectListView: View {
     }
 
     private func enableAll() {
+        let disabledPlugInURLs = ejectList.injectedPlugIns
+            .filter { !$0.isEnabled }
+            .map { $0.url }
 
+        var logFileURL: URL?
+
+        do {
+            let injector = try InjectorV3(ejectList.app.url)
+            logFileURL = injector.latestLogFileURL
+
+            if injector.appID.isEmpty {
+                injector.appID = ejectList.app.id
+            }
+
+            if injector.teamID.isEmpty {
+                injector.teamID = ejectList.app.teamID
+            }
+
+            injector.useWeakReference = useWeakReference
+            injector.preferMainExecutable = preferMainExecutable
+            injector.injectStrategy = injectStrategy
+
+            let view = viewControllerHost.viewController?
+                .navigationController?.view
+
+            view?.isUserInteractionEnabled = false
+
+            isEnablingAll = true
+            isDisablingAll = false
+            isDeletingAll = false
+
+            DispatchQueue.global(qos: .userInitiated).async {
+                defer {
+                    DispatchQueue.main.async {
+                        ejectList.app.reload()
+                        ejectList.reload()
+
+                        isEnablingAll = false
+                        isDisablingAll = false
+                        isDeletingAll = false
+
+                        view?.isUserInteractionEnabled = true
+                    }
+                }
+
+                do {
+                    try injector.inject(disabledPlugInURLs, shouldPersist: false)
+                } catch {
+                    DispatchQueue.main.async {
+                        DDLogError("\(error)", ddlog: InjectorV3.main.logger)
+
+                        var userInfo: [String: Any] = [
+                            NSLocalizedDescriptionKey: error.localizedDescription,
+                        ]
+
+                        if let logFileURL {
+                            userInfo[NSURLErrorKey] = logFileURL
+                        }
+
+                        let nsErr = NSError(domain: Constants.gErrorDomain, code: 0, userInfo: userInfo)
+
+                        lastError = nsErr
+                        isErrorOccurred = true
+                    }
+                }
+            }
+        } catch {
+            lastError = error
+            isErrorOccurred = true
+        }
     }
 
     private func disableAll() {
@@ -365,15 +438,20 @@ struct EjectListView: View {
 
             view?.isUserInteractionEnabled = false
 
+            isEnablingAll = false
+            isDisablingAll = !shouldDesist
             isDeletingAll = shouldDesist
 
-            DispatchQueue.global(qos: .userInteractive).async {
+            DispatchQueue.global(qos: .userInitiated).async {
                 defer {
                     DispatchQueue.main.async {
                         ejectList.app.reload()
                         ejectList.reload()
 
+                        isEnablingAll = false
+                        isDisablingAll = false
                         isDeletingAll = false
+
                         view?.isUserInteractionEnabled = true
                     }
                 }
@@ -413,7 +491,7 @@ struct EjectListView: View {
 
         isExportingAll = true
 
-        DispatchQueue.global(qos: .userInteractive).async {
+        DispatchQueue.global(qos: .userInitiated).async {
             defer {
                 DispatchQueue.main.async {
                     isExportingAll = false

TrollFools/InjectView.swift

@@ -94,7 +94,7 @@ struct InjectView: View {
             viewControllerHost.viewController = viewController
         }
         .onAppear {
-            DispatchQueue.global(qos: .userInteractive).async {
+            DispatchQueue.global(qos: .userInitiated).async {
                 let result = inject()
 
                 DispatchQueue.main.async {
@@ -126,7 +126,7 @@ struct InjectView: View {
             injector.preferMainExecutable = preferMainExecutable
             injector.injectStrategy = injectStrategy
 
-            try injector.inject(urlList)
+            try injector.inject(urlList, shouldPersist: true)
             return .success(injector.latestLogFileURL)
 
         } catch {

TrollFools/InjectedPlugIn.swift

@@ -16,8 +16,7 @@ struct InjectedPlugIn: Identifiable, Hashable {
     init(url: URL, isEnabled: Bool) {
         self.id = url.absoluteString
         self.url = url
-        let attributes = try? FileManager.default.attributesOfItem(atPath: url.path)
-        self.createdAt = attributes?[.creationDate] as? Date ?? Date()
+        self.createdAt = (try? url.resourceValues(forKeys: [.creationDateKey]).creationDate) ?? Date()
         self.isEnabled = isEnabled
     }
 }

TrollFools/InjectorV3+Eject.swift

@@ -12,7 +12,19 @@ extension InjectorV3 {
     // MARK: - Instance Methods
 
     func ejectAll(shouldDesist: Bool) throws {
-        try eject(injectedAssetURLsInBundle(bundleURL), shouldDesist: shouldDesist)
+        var assetURLs: [URL]
+
+        assetURLs = injectedAssetURLsInBundle(bundleURL)
+        if !assetURLs.isEmpty {
+            try eject(assetURLs, shouldDesist: shouldDesist)
+        }
+
+        if shouldDesist {
+            assetURLs = persistedAssetURLs(id: appID)
+            if !assetURLs.isEmpty {
+                desist(assetURLs)
+            }
+        }
     }
 
     func eject(_ assetURLs: [URL], shouldDesist: Bool) throws {

TrollFools/InjectorV3+Inject.swift

@@ -27,7 +27,7 @@ extension InjectorV3 {
 
     // MARK: - Instance Methods
 
-    func inject(_ assetURLs: [URL]) throws {
+    func inject(_ assetURLs: [URL], shouldPersist: Bool) throws {
         let preparedAssetURLs = try preprocessAssets(assetURLs)
 
         precondition(!preparedAssetURLs.isEmpty, "No asset to inject.")
@@ -39,7 +39,9 @@ extension InjectorV3 {
         try injectDylibsAndFrameworks(preparedAssetURLs
             .filter { $0.pathExtension.lowercased() == "dylib" || $0.pathExtension.lowercased() == "framework" })
 
-        try persist(assetURLs)
+        if shouldPersist {
+            try persist(assetURLs)
+        }
     }
 
     // MARK: - Private Methods