Detect if there's custom settings that need to be migrated.

cormiertyshawn895 · Jan 19, 2020 · 8fa97ed · 8fa97ed
1 parent bf25fcf
commit 8fa97ed
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/Retroactive.xcodeproj/project.pbxproj b/Retroactive.xcodeproj/project.pbxproj
@@ -602,7 +602,7 @@
 				CODE_SIGN_ENTITLEMENTS = Retroactive/Support/Retroactive.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				INFOPLIST_FILE = Retroactive/Support/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -623,7 +623,7 @@
 				CODE_SIGN_ENTITLEMENTS = Retroactive/Support/Retroactive.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				INFOPLIST_FILE = Retroactive/Support/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",

diff --git a/Retroactive/AppManager.swift b/Retroactive/AppManager.swift
@@ -34,6 +34,8 @@ let systemNameToken = "{systemName}"
 let purposeToken = "{purpose}"
 let actionPresentTenseToken = "{actionPR}"
 
+let kCustomSettingsPath = "/Library/Application Support/Final Cut Pro System Support/Custom Settings"
+
 extension Bundle {
     var cfBundleVersionInt: Int? {
         get {

diff --git a/Retroactive/StepOne/AppFinder.swift b/Retroactive/StepOne/AppFinder.swift
@@ -91,6 +91,22 @@ class AppFinder: NSObject {
                                 }
                             }
                         }
+                    } else if AppManager.shared.chosenApp == .finalCutPro7 {
+                        do {
+                            let exists = FileManager.default.fileExists(atPath: kCustomSettingsPath)
+                            if (!exists) {
+                                self.pushCompletionVC()
+                                return
+                            }
+                            let contents = try FileManager.default.contentsOfDirectory(atPath: kCustomSettingsPath)
+                            let presets = contents.filter { $0.lowercased().hasSuffix(".fcpre") }
+                            if (presets.count == 0) {
+                                self.pushCompletionVC()
+                                return
+                            }
+                        } catch {
+                            print("Can't determine if custom settings exist \(error)")
+                        }
                     } else {
                         self.pushCompletionVC()
                         return

diff --git a/Retroactive/StepThree/ProgressViewController.swift b/Retroactive/StepThree/ProgressViewController.swift
@@ -164,7 +164,7 @@ class ProgressViewController: NSViewController, URLSessionDelegate, URLSessionDa
             let kBrowserKitCopyPath = "\(kLibraryFrameworkPath)/BrowserKit.framework"
             let kProKitCopyPath = "\(kLibraryFrameworkPath)/ProKit.framework"
             let kAudioToolboxCopyPath = "\(appPath)/Contents/Frameworks/AudioToolbox.framework"
-            let kCustomSettingsPath = "/Library/Application Support/Final Cut Pro System Support/Custom Settings".fileSystemString
+            let fsCustomSettingsPath = kCustomSettingsPath.fileSystemString
 
             if (fullMode == true) {
                 // It shouldn't be possible to have ProKit or BrowserKit at /System/Library/Frameworks on High Sierra or Mojave, and deleting them will fail with SIP.
@@ -233,7 +233,7 @@ class ProgressViewController: NSViewController, URLSessionDelegate, URLSessionDa
             self.runTask(toolPath: "/usr/bin/plutil", arguments: ["-replace", kCFBundleVersion, "-string", AppManager.shared.patchedVersionStringOfChosenApp, "Contents/Info.plist"])
 
             // Having custom settings will hang Final Cut Pro at launch, let's delete it.
-            self.runTask(toolPath: "/bin/rm", arguments: ["-rf", kCustomSettingsPath])
+            self.runTask(toolPath: "/bin/rm", arguments: ["-rf", fsCustomSettingsPath])
 
             self.stage4Started()
             self.runTask(toolPath: "/usr/bin/codesign", arguments: ["-fs", "-", appPath, "--deep"])

diff --git a/Retroactive/Support/SupportPath.plist b/Retroactive/Support/SupportPath.plist
@@ -17,7 +17,7 @@
 	<key>LatestZIP</key>
 	<string>https://github.com/cormiertyshawn895/Retroactive/releases/download/1.4/Retroactive.1.4.zip</string>
 	<key>LatestBuildNumber</key>
-	<integer>15</integer>
+	<integer>16</integer>
 	<key>SupportPathURL</key>
 	<string>https://raw.githubusercontent.com/cormiertyshawn895/Retroactive/master/Retroactive/Support/SupportPath.plist</string>
 	<key>ReleasePage</key>