fix partial paths works

Signed-off-by: Joseph Mattiello <git@joemattiello.com>
nonomal · Dec 3, 2024 · 2f25fc9 · 2f25fc9
1 parent 7dadcf5
commit 2f25fc9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/PVLibrary/Sources/PVLibrary/Database/PVGameLibrary+Migration.swift b/PVLibrary/Sources/PVLibrary/Database/PVGameLibrary+Migration.swift
@@ -362,30 +362,28 @@ public final class ROMLocationMigrator {
                 continue
             }
 
-            let currentPath = file.relativePath
+            let currentPath = file.partialPath
             DLOG("Checking path for game \(game.title): \(currentPath)")
-
+            let romsPrefix = Paths.romsPath.lastPathComponent + "/"
             // Check if path needs fixing
-            if !currentPath.hasPrefix("ROMs/") {
+            if !currentPath.hasPrefix(romsPrefix) || currentPath.contains("Container"){
                 // If it starts with the system ID, add ROMs/ prefix
                 if currentPath.hasPrefix(game.systemIdentifier + "/") {
-                    let newPath = "ROMs/" + currentPath
+                    let newPath = romsPrefix + currentPath
                     DLOG("Fixing path: \(currentPath) -> \(newPath)")
 
                     try realm.write {
-                        let newFile = PVFile(withPartialPath: newPath)
-                        game.file = newFile
+                        game.file.partialPath = newPath
                     }
                     fixCount += 1
                     ILOG("Fixed partial path for \(game.title)")
                 } else {
                     // If it's just a filename, add full path
-                    let newPath = "ROMs/\(game.systemIdentifier)/\(currentPath)"
+                    let newPath = "\(romsPrefix)\(game.systemIdentifier)/\(file.url.lastPathComponent)"
                     DLOG("Fixing path: \(currentPath) -> \(newPath)")
 
                     try realm.write {
-                        let newFile = PVFile(withPartialPath: newPath)
-                        game.file = newFile
+                        game.file.partialPath = newPath
                     }
                     fixCount += 1
                     ILOG("Fixed partial path for \(game.title)")

diff --git a/PVLibrary/Sources/PVRealm/RealmPlatform/Entities/Files/PVFile.swift b/PVLibrary/Sources/PVRealm/RealmPlatform/Entities/Files/PVFile.swift
@@ -21,7 +21,7 @@ public class PVFile: Object, LocalFileProvider, Codable, DomainConvertibleType {
     public typealias DomainType = LocalFile
 
     nonisolated(unsafe)
-    internal dynamic var partialPath: String = ""
+    public dynamic var partialPath: String = ""
     nonisolated(unsafe)
     internal dynamic var md5Cache: String?
     //    @objc private dynamic var crcCache: String?