Bug/ios icloud not syncing

Cores/Atari800/Sources/PVAtari800Bridge/PVAtari800Bridge.m

@@ -733,10 +733,10 @@ - (void)pollControllers {
             } else if (gamepad.rightThumbstick.down.isPressed) {
                 //4 button
                 INPUT_key_code = AKEY_5200_4;
-            } else if (gamepad.leftThumbstickButton.isPressed) {
+            } else if (gamepad.leftThumbstickButton != nil && gamepad.leftThumbstickButton.isPressed) {
                 //5 button
                 INPUT_key_code = AKEY_5200_5;
-            } else if (gamepad.rightThumbstickButton.isPressed) {
+            } else if (gamepad.rightThumbstickButton != nil && gamepad.rightThumbstickButton.isPressed) {
                 //6 button
                 INPUT_key_code = AKEY_5200_6;
             } else if (gamepad.buttonX.isPressed) {

Extensions/Spotlight/Spotlight.entitlements

@@ -6,7 +6,7 @@
 	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.org.provenance-emu.provenance</string>
+		<string>$(APP_GROUP_IDENTIFIER)</string>
 	</array>
 	<key>com.apple.security.assets.pictures.read-only</key>
 	<true/>

Extensions/TopShelf/TopShelf.entitlements

@@ -6,7 +6,7 @@
 	<string>development</string>
 	<key>com.apple.developer.icloud-container-identifiers</key>
 	<array>
-		<string>iCloud.org.provenance.provenance</string>
+		<string>$(ICLOUD_CONTAINER_IDENTIFIER)</string>
 	</array>
 	<key>com.apple.developer.icloud-services</key>
 	<array>
@@ -16,7 +16,7 @@
 	<string>$(TeamIdentifierPrefix)$(CFBundleIdentifier)</string>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.org.provenance-emu.provenance</string>
+		<string>$(APP_GROUP_IDENTIFIER)</string>
 	</array>
 </dict>
 </plist>

PVLibrary/Sources/PVLibrary/Database/Notifications.swift

@@ -10,4 +10,6 @@ import Foundation
 public extension Notification.Name {
     static let DatabaseMigrationStarted = Notification.Name("DatabaseMigrarionStarted")
     static let DatabaseMigrationFinished = Notification.Name("DatabaseMigrarionFinished")
+    static let RomDatabaseInitialized = Notification.Name("RomDatabaseInitialized")
+    static let RomsFinishedImporting = Notification.Name("RomsFinishedImporting")
 }

PVLibrary/Sources/PVLibrary/Database/Realm Database/RomDatabase+Saves.swift

@@ -198,8 +198,8 @@ public extension RomDatabase {
                         guard let core = realm.object(ofType: PVCore.self, forPrimaryKey: core.coreIdentifier) else {
                             throw SaveStateError.noCoreFound(core.coreIdentifier ?? "null")
                         }
-                        let imgFile = PVImageFile(withURL:  URL(fileURLWithPath: url.path.replacingOccurrences(of: "svs", with: "jpg")))
-                        let saveFile = PVFile(withURL: url)
+                        let imgFile = PVImageFile(withURL:  URL(fileURLWithPath: url.path.replacingOccurrences(of: "svs", with: "jpg")), relativeRoot: .iCloud)
+                        let saveFile = PVFile(withURL: url, relativeRoot: .iCloud)
                         let newState = PVSaveState(withGame: game, core: core, file: saveFile, image: imgFile, isAutosave: false)
                         try realm.write {
                             realm.add(newState)

PVLibrary/Sources/PVLibrary/Database/Realm Database/RomDatabase.swift

@@ -341,6 +341,7 @@ public final class RomDatabase {
 
             ILOG("Database initialization completed")
             databaseInitialized = true
+            NotificationCenter.default.post(name: .RomDatabaseInitialized, object: nil, userInfo: nil)
         } else {
             ILOG("Database already initialized")
         }
@@ -762,6 +763,9 @@ public extension RomDatabase {
 #if os(iOS)
         deleteFromSpotlight(game: game)
 #endif
+        defer {
+            RomDatabase.reloadGamesCache()
+        }
         do {
             deleteRelatedFilesGame(game)
             game.saveStates.forEach { try? $0.delete() }
@@ -771,7 +775,8 @@ public extension RomDatabase {
             try game.delete()
         } catch {
             // Delete the DB entry anyway if any of the above files couldn't be removed
-            do { try game.delete() } catch {
+            do { try game.delete()
+            } catch {
                 ELOG("\(error.localizedDescription)")
             }
             ELOG("\(error.localizedDescription)")
@@ -824,6 +829,15 @@ public extension RomDatabase {
                 throw RomDeletionError.fileManagerDeletionError(error)
             }
         }
+        if let jsonFile = actualSavePath?.pathDecoded.appending(".json"),
+           FileManager.default.fileExists(atPath: jsonFile) {
+            do {
+                try FileManager.default.removeItem(atPath: jsonFile)
+            } catch {
+                ELOG("Unable to delete json at path: \(jsonFile) because: \(error.localizedDescription)")
+                throw RomDeletionError.fileManagerDeletionError(error)
+            }
+        }
     }
 
     func deleteRelatedFilesGame(_ game: PVGame) {
@@ -841,6 +855,48 @@ public extension RomDatabase {
                 ELOG(error.localizedDescription)
             }
         }
+        //attempt to delete files with the same name. There's an issue when importing that the files do NOT get associated, so if we assume the user imported properly, the name should just be the same with different extensions.
+        let fileManager: FileManager = .default
+        guard let gameFileUrl = game.file?.url
+        else {
+            return
+        }
+        let parentDirectory = gameFileUrl.deletingLastPathComponent()
+        guard fileManager.fileExists(atPath: parentDirectory.pathDecoded)
+        else {
+            return
+        }
+        let children: [String]
+        do {
+            children = try fileManager.subpathsOfDirectory(atPath: parentDirectory.pathDecoded)
+        } catch {
+            ELOG("error retrieving files at directory: \(parentDirectory), \(error)")
+            return
+        }
+        guard !children.isEmpty
+        else {
+            return
+        }
+        DLOG("children: \(children)")
+        let fileName = gameFileUrl.deletingPathExtension().lastPathComponent
+        DLOG("fileName without extension: \(fileName)")
+        children.forEach { child in
+            let currentChildUrl = parentDirectory.appendingPathComponent(child)
+            let currentExtension = currentChildUrl.pathExtension
+            let currentChildFileName = currentChildUrl.deletingPathExtension().lastPathComponent
+            DLOG("current extension: \(currentExtension), current file name: \(currentChildFileName), current url: \(currentChildUrl)")
+            if !currentExtension.isEmpty
+                && (currentChildFileName == fileName
+                    || currentChildFileName.starts(with: "\(fileName) (Track ")
+                    || currentChildFileName.starts(with: "\(fileName) (Disc ")
+                    ) {
+                do {
+                    try fileManager.removeItem(at: currentChildUrl)
+                } catch {
+                    ELOG("error deleting file: \(currentChildUrl)")
+                }
+            }
+        }
     }
 }
 

PVLibrary/Sources/PVLibrary/Importer/Services/GameImporter/GameImporter.swift

@@ -423,6 +423,27 @@ public final class GameImporter: GameImporting, ObservableObject {
 
         importQueue.remove(atOffsets: offsets)
     }
+
+    /// Searches for successful imports filtered by files and removes from importQueue and files. This is so that only files imported by iCloud can be removed
+    /// - Parameter files: set of files to check
+    public func removeSuccessfulImports(from files: inout Set<URL>) {
+        guard !files.isEmpty
+        else {
+            return
+        }
+        importQueueLock.lock()
+        defer {
+            importQueueLock.unlock()
+        }
+        let offsets = IndexSet(importQueue.enumerated().compactMap { index, item in
+            if item.status == .success && files.contains(item.url) {
+                files.remove(item.url)
+                return index
+            }
+            return nil
+        })
+        importQueue.remove(atOffsets: offsets)
+    }
 
     // Public method to manually start processing if needed
     public func startProcessing() {
@@ -658,6 +679,11 @@ public final class GameImporter: GameImporting, ObservableObject {
 
     // Processes each ImportItem in the queue sequentially
     private func processQueue() async {
+        defer {
+            DispatchQueue.main.async {
+                NotificationCenter.default.post(name: .RomsFinishedImporting, object: nil)
+            }
+        }
         // Check for items that are either queued or have a user-chosen system
         let itemsToProcess = importQueue.filter {
             $0.status == .queued || $0.userChosenSystem != nil

PVLibrary/Sources/PVLibrary/Importer/Services/GameImporter/GameImporterDatabaseService.swift

@@ -135,7 +135,7 @@ class GameImporterDatabaseService : GameImporterDatabaseServicing {
             throw GameImporterError.noSystemMatched
         }
 
-        let file = PVFile(withURL: queueItem.destinationUrl!)
+        let file = PVFile(withURL: queueItem.destinationUrl!, relativeRoot: .iCloud)
         let game = PVGame(withFile: file, system: system)
         game.romPath = partialPath
         game.title = title
@@ -205,7 +205,7 @@ class GameImporterDatabaseService : GameImporterDatabaseServicing {
         }
         if PVMediaCache.fileExists(forKey: url) {
             if let localURL = PVMediaCache.filePath(forKey: url) {
-                let file = PVImageFile(withURL: localURL, relativeRoot: .iCloud)
+                let file = PVImageFile(withURL: localURL, relativeRoot: .documents)
                 game.originalArtworkFile = file
                 return game
             }
@@ -229,15 +229,15 @@ class GameImporterDatabaseService : GameImporterDatabaseServicing {
             if let artwork = NSImage(data: data) {
                 do {
                     let localURL = try PVMediaCache.writeImage(toDisk: artwork, withKey: url)
-                    let file = PVImageFile(withURL: localURL, relativeRoot: .iCloud)
+                    let file = PVImageFile(withURL: localURL, relativeRoot: .documents)
                     game.originalArtworkFile = file
                 } catch { ELOG("\(error.localizedDescription)") }
             }
 #elseif !os(watchOS)
             if let artwork = UIImage(data: data) {
                 do {
                     let localURL = try PVMediaCache.writeImage(toDisk: artwork, withKey: url)
-                    let file = PVImageFile(withURL: localURL, relativeRoot: .iCloud)
+                    let file = PVImageFile(withURL: localURL, relativeRoot: .documents)
                     game.originalArtworkFile = file
                 } catch { ELOG("\(error.localizedDescription)") }
             }

PVLibrary/Sources/PVLibrary/Importer/Services/GameImporter/GameImporterSystemsService.swift

@@ -42,7 +42,12 @@ class GameImporterSystemsService: GameImporterSystemsServicing {
     }
 
     func determineSystems(for item: ImportQueueItem) async throws -> [SystemIdentifier] {
-        // First try MD5 lookup
+        // if syncing from icloud, we have the system, so try to get the system this way
+        if let system = SystemIdentifier(rawValue: item.url.deletingLastPathComponent().lastPathComponent) {
+            DLOG("found system: \(system)")
+            return [system]
+        }
+        // next try MD5 lookup
         if let md5 = item.md5 {
             if let systemID = try await lookup.systemIdentifier(forRomMD5: md5, or: item.url.lastPathComponent) {
                 return [systemID]