Merge pull request #2356 from proskd/cloud-local-files-import

Cloud and Local Files importing
Provenance-Emu · Oct 21, 2024 · 00e751b · 00e751b
2 parents f2aafff + 6f0b1e3
commit 00e751b
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 34 deletions.
diff --git a/Build.xcconfig b/Build.xcconfig
@@ -20,6 +20,7 @@ PRODUCT_NAME = $(TARGET_NAME)
 
 _PRODUCT_BUNDLE_IDENTIFIER_ = $(ORG_PREFIX).$(PROJECT_NAME:lower)
 PRODUCT_BUNDLE_IDENTIFIER = $(ORG_PREFIX).$(PROJECT_NAME:lower)
+PRODUCT_BUNDLE_IDENTIFIER_LITE = $(ORG_PREFIX).$(PROJECT_NAME:lower).lite
 //PRODUCT_BUNDLE_IDENTIFIER[configuration=Debug] = $(ORG_PREFIX).$(PROJECT_NAME:lower)-debug
 
 APP_GROUP_IDENTIFIER        = group.$(ORG_PREFIX).$(PROJECT_NAME:lower)

diff --git a/PVLibrary/Sources/DirectoryWatcher/DirectoryWatcher.swift b/PVLibrary/Sources/DirectoryWatcher/DirectoryWatcher.swift
@@ -505,14 +505,13 @@ extension DirectoryWatcher {
     /// Handle an imported file
     public func handleImportedFile(at url: URL) {
         ILOG("Handling imported file: \(url.lastPathComponent)")
-        guard url.startAccessingSecurityScopedResource() else {
-            ELOG("Failed to access security scoped resource for file: \(url.lastPathComponent)")
-            return
-        }
+        let secureDoc = url.startAccessingSecurityScopedResource()
 
         defer {
-            url.stopAccessingSecurityScopedResource()
-            ILOG("Stopped accessing security scoped resource for file: \(url.lastPathComponent)")
+            if secureDoc {
+                url.stopAccessingSecurityScopedResource()
+                ILOG("Stopped accessing security scoped resource for file: \(url.lastPathComponent)")
+            }
         }
 
         let coordinator = NSFileCoordinator()

diff --git a/PVLibrary/Sources/PVLibrary/Importer/iCloud/iCloudSync.swift b/PVLibrary/Sources/PVLibrary/Importer/iCloud/iCloudSync.swift
@@ -377,13 +377,13 @@ public enum iCloudSync {
                 await jsonFiles.concurrentForEach { @MainActor json in
                     let realm = try! await Realm()
                     do {
-                        guard json.startAccessingSecurityScopedResource() else {
-                            ELOG("startAccessingSecurityScopedResource failed")
-                            return
-                        }
+
+                        let secureDoc = json.startAccessingSecurityScopedResource()
 
                         defer {
-                            json.stopAccessingSecurityScopedResource()
+                            if secureDoc {
+                                json.stopAccessingSecurityScopedResource()
+                            }
                         }
 
                         var dataMaybe = FileManager.default.contents(atPath: json.path)

diff --git a/PVUI/Sources/PVUIBase/Game Library/PVGameLibraryUpdatesController.swift b/PVUI/Sources/PVUIBase/Game Library/PVGameLibraryUpdatesController.swift
@@ -315,11 +315,12 @@ public extension PVGameLibraryUpdatesController {
     }
 
     private func copyFileToImports(from sourceURL: URL) {
-        guard sourceURL.startAccessingSecurityScopedResource() else {
-            ELOG("startAccessingSecurityScopedResource failed for \(sourceURL.path)")
-            return
+        let secureDoc = sourceURL.startAccessingSecurityScopedResource()
+        defer {
+            if secureDoc {
+                sourceURL.stopAccessingSecurityScopedResource()
+            }
         }
-        defer { sourceURL.stopAccessingSecurityScopedResource() }
 
         let destinationURL = Paths.romsImportPath.appendingPathComponent(sourceURL.lastPathComponent)
 

diff --git a/Provenance.xcodeproj/project.pbxproj b/Provenance.xcodeproj/project.pbxproj
@@ -8973,7 +8973,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEVELOPMENT_TEAM = S32Z3HMYVQ;
+				DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)";
 				ENABLE_HARDENED_RUNTIME = YES;
 				"ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -9025,9 +9025,10 @@
 				OTHER_CFLAGS = "-Wno-deprecated-declarations";
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-function-bodies=300 -Xfrontend -warn-long-expression-type-checking=200 -DAPP_STORE -DAPPSTORE";
-				"PRODUCT_BUNDLE_IDENTIFIER[sdk=appletvos*]" = "org.provenance-emu.provenance.lite";
-				"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "org.provenance-emu.provenance.lite";
-				"PRODUCT_BUNDLE_IDENTIFIER[sdk=macosx*]" = "org.provenance-emu.provenance.lite";
+				PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER_LITE)";
+				"PRODUCT_BUNDLE_IDENTIFIER[sdk=appletvos*]" = "$(PRODUCT_BUNDLE_IDENTIFIER_LITE)";
+				"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "$(PRODUCT_BUNDLE_IDENTIFIER_LITE)";
+				"PRODUCT_BUNDLE_IDENTIFIER[sdk=macosx*]" = "$(PRODUCT_BUNDLE_IDENTIFIER_LITE)";
 				PRODUCT_NAME = "Provenance Lite";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = auto;
@@ -9072,7 +9073,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = S32Z3HMYVQ;
+				DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)";
 				ENABLE_HARDENED_RUNTIME = YES;
 				"ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -9127,9 +9128,10 @@
 				);
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-function-bodies=300 -Xfrontend -warn-long-expression-type-checking=200 -DAPP_STORE -DAPPSTORE";
-				"PRODUCT_BUNDLE_IDENTIFIER[sdk=appletvos*]" = "org.provenance-emu.provenance.lite";
-				"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "org.provenance-emu.provenance.lite";
-				"PRODUCT_BUNDLE_IDENTIFIER[sdk=macosx*]" = "org.provenance-emu.provenance.lite";
+				PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER_LITE)";
+				"PRODUCT_BUNDLE_IDENTIFIER[sdk=appletvos*]" = "$(PRODUCT_BUNDLE_IDENTIFIER_LITE)";
+				"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "$(PRODUCT_BUNDLE_IDENTIFIER_LITE)";
+				"PRODUCT_BUNDLE_IDENTIFIER[sdk=macosx*]" = "$(PRODUCT_BUNDLE_IDENTIFIER_LITE)";
 				PRODUCT_NAME = "Provenance Lite";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = auto;
@@ -9170,7 +9172,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = S32Z3HMYVQ;
+				DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)";
 				ENABLE_HARDENED_RUNTIME = YES;
 				"ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -9225,9 +9227,10 @@
 				);
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-function-bodies=300 -Xfrontend -warn-long-expression-type-checking=200 -DAPP_STORE -DAPPSTORE";
-				"PRODUCT_BUNDLE_IDENTIFIER[sdk=appletvos*]" = "org.provenance-emu.provenance.lite";
-				"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "org.provenance-emu.provenance.lite";
-				"PRODUCT_BUNDLE_IDENTIFIER[sdk=macosx*]" = "org.provenance-emu.provenance.lite";
+				PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER_LITE)";
+				"PRODUCT_BUNDLE_IDENTIFIER[sdk=appletvos*]" = "$(PRODUCT_BUNDLE_IDENTIFIER_LITE)";
+				"PRODUCT_BUNDLE_IDENTIFIER[sdk=iphoneos*]" = "$(PRODUCT_BUNDLE_IDENTIFIER_LITE)";
+				"PRODUCT_BUNDLE_IDENTIFIER[sdk=macosx*]" = "$(PRODUCT_BUNDLE_IDENTIFIER_LITE)";
 				PRODUCT_NAME = "Provenance Lite";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = auto;

diff --git a/Provenance/PVAppDelegate+Open.swift b/Provenance/PVAppDelegate+Open.swift
@@ -132,14 +132,17 @@ extension PVAppDelegate {
     func handle(fileURL url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
         let filename = url.lastPathComponent
         let destinationPath = Paths.romsImportPath.appendingPathComponent(filename, isDirectory: false)
-
+        var secureDocument = false
         do {
             defer {
-                url.stopAccessingSecurityScopedResource()
+                if secureDocument {
+                    url.stopAccessingSecurityScopedResource()
+                }
+
             }
 
             // Doesn't seem we need access in dev builds?
-            _ = url.startAccessingSecurityScopedResource()
+            secureDocument = url.startAccessingSecurityScopedResource()
 
             if let openInPlace = options[.openInPlace] as? Bool, openInPlace {
                 try FileManager.default.copyItem(at: url, to: destinationPath)

diff --git a/Provenance/Provenance-AppStore.entitlements b/Provenance/Provenance-AppStore.entitlements
@@ -11,7 +11,7 @@
 	</array>
 	<key>com.apple.developer.icloud-container-identifiers</key>
 	<array>
-		<string>iCloud.org.provenance-emu.provenance</string>
+		<string>$(ICLOUD_CONTAINER_IDENTIFIER)</string>
 	</array>
 	<key>com.apple.developer.icloud-services</key>
 	<array>
@@ -26,16 +26,16 @@
 	<true/>
 	<key>com.apple.developer.ubiquity-container-identifiers</key>
 	<array>
-		<string>iCloud.org.provenance-emu.provenance</string>
+		<string>$(ICLOUD_CONTAINER_IDENTIFIER)</string>
 	</array>
 	<key>com.apple.developer.ubiquity-kvstore-identifier</key>
 	<string>$(TeamIdentifierPrefix)$(CFBundleIdentifier)</string>
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.org.provenance-emu.provenance</string>
-		<string>group.org.provenance-emu</string>
+		<string>$(APP_GROUP_IDENTIFIER).provenance</string>
+		<string>$(APP_GROUP_IDENTIFIER)</string>
 	</array>
 	<key>com.apple.security.assets.pictures.read-write</key>
 	<true/>