GameImporter Rewrite

PVLibrary/Sources/PVLibrary/Configuration/PVEmulatorConfiguration.swift

@@ -365,68 +365,6 @@ public extension PVEmulatorConfiguration {
             }
         }
     }
-
-    class func cmpSpecialExt(obj1Extension: String, obj2Extension: String) -> Bool {
-        if obj1Extension == "m3u" && obj2Extension != "m3u" {
-            return obj1Extension > obj2Extension
-        } else if obj1Extension == "m3u" {
-            return false
-        } else if obj2Extension == "m3u" {
-            return true
-        }
-        if Extensions.artworkExtensions.contains(obj1Extension) {
-            return false
-        } else if Extensions.artworkExtensions.contains(obj2Extension) {
-            return true
-        }
-        return obj1Extension > obj2Extension
-    }
-
-    class func cmp(obj1: URL, obj2: URL) -> Bool {
-        let obj1Filename = obj1.lastPathComponent
-        let obj2Filename = obj2.lastPathComponent
-        let obj1Extension = obj1.pathExtension.lowercased()
-        let obj2Extension = obj2.pathExtension.lowercased()
-        let name1=PVEmulatorConfiguration.stripDiscNames(fromFilename: obj1Filename)
-        let name2=PVEmulatorConfiguration.stripDiscNames(fromFilename: obj2Filename)
-        if name1 == name2 {
-             // Standard sort
-            if obj1Extension == obj2Extension {
-                return obj1Filename < obj2Filename
-            }
-            return obj1Extension > obj2Extension
-        } else {
-            return name1 < name2
-        }
-    }
-
-    class func sortImportURLs(urls: [URL]) -> [URL] {
-        var ext:[String:[URL]] = [:]
-        // separate array by file extension
-        urls.forEach({ (url) in
-            if var urls = ext[url.pathExtension.lowercased()] {
-                urls.append(url)
-                ext[url.pathExtension.lowercased()]=urls
-            } else {
-                ext[url.pathExtension.lowercased()]=[url]
-            }
-        })
-        // sort
-        var sorted: [URL] = []
-        ext.keys
-            .sorted(by: cmpSpecialExt)
-            .forEach {
-            if let values = ext[$0] {
-                let values = values.sorted { (obj1, obj2) -> Bool in
-                    return cmp(obj1: obj1, obj2: obj2)
-                }
-                sorted.append(contentsOf: values)
-                ext[$0] = values
-            }
-        }
-        VLOG(sorted.map { $0.lastPathComponent }.joined(separator: ", "))
-        return sorted
-    }
 }
 
 // MARK: System queries

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

@@ -572,7 +572,8 @@ public extension RomDatabase {
                     game.title = title
                         if game.releaseID == nil || game.releaseID!.isEmpty {
                             ILOG("Game isn't already matched, going to try to re-match after a rename")
-                            GameImporter.shared.lookupInfo(for: game, overwrite: false)
+                            //TODO: figure out when this happens and fix
+                            //GameImporter.shared.lookupInfo(for: game, overwrite: false)
                         }
                 }
             } catch {

PVLibrary/Sources/PVLibrary/Importer/Services/GameImporter/GameImporterError.swift → PVLibrary/Sources/PVLibrary/Importer/Models/GameImporterError.swift

@@ -13,4 +13,9 @@ public enum GameImporterError: Error, Sendable {
     case systemNotDetermined
     case failedToMoveCDROM(Error)
     case failedToMoveROM(Error)
+    case unsupportedFile
+    case noBIOSMatchForBIOSFileType
+    case unsupportedCDROMFile
+    case incorrectDestinationURL
+    case conflictDetected
 }

PVLibrary/Sources/PVLibrary/Importer/Models/ImportQueueItem.swift

@@ -0,0 +1,118 @@
+//
+//  ImportStatus.swift
+//  PVLibrary
+//
+//  Created by David Proskin on 11/3/24.
+//
+
+import SwiftUI
+import PVPrimitives
+
+// Enum to define the possible statuses of each import
+public enum ImportStatus: String {
+    case queued
+    case processing
+    case success
+    case failure
+    case conflict  // Indicates additional action needed by user after successful import
+
+    public var description: String {
+        switch self {
+            case .queued: return "Queued"
+            case .processing: return "Processing"
+            case .success: return "Completed"
+            case .failure: return "Failed"
+            case .conflict: return "Conflict"
+        }
+    }
+
+    public var color: Color {
+        switch self {
+            case .queued: return .gray
+            case .processing: return .blue
+            case .success: return .green
+            case .failure: return .red
+            case .conflict: return .yellow
+        }
+    }
+}
+
+// Enum to define file types for each import
+public enum FileType {
+    case bios, artwork, game, cdRom, unknown
+}
+
+// Enum to track processing state
+public enum ProcessingState {
+    case idle
+    case processing
+}
+
+// ImportItem model to hold each file's metadata and progress
+@Observable
+public class ImportQueueItem: Identifiable, ObservableObject {
+    public let id = UUID()
+    public var url: URL
+    public var fileType: FileType
+    public var systems: [PVSystem]  // Can be set to the specific system type
+    public var userChosenSystem: PVSystem?
+    public var destinationUrl: URL?
+
+    //this is used when a single import has child items - e.g., m3u, cue, directory
+    public var childQueueItems:[ImportQueueItem]
+
+    // Observable status for individual imports
+    public var status: ImportStatus = .queued
+
+    public init(url: URL, fileType: FileType = .unknown) {
+        self.url = url
+        self.fileType = fileType
+        self.systems = []
+        self.userChosenSystem = nil
+        self.childQueueItems = []
+    }
+
+    public var md5: String? {
+        if let cached = cache.md5 {
+            return cached
+        } else {
+            let computed = FileManager.default.md5ForFile(atPath: url.path, fromOffset: 0)
+            cache.md5 = computed
+            return computed
+        }
+    }
+
+    // Store a cache in a nested class.
+    // The struct only contains a reference to the class, not the class itself,
+    // so the struct cannot prevent the class from mutating.
+    private final class Cache: Codable {
+        var md5: String?
+    }
+
+    public func targetSystem() -> PVSystem? {
+        guard !systems.isEmpty else {
+            return nil
+        }
+
+        if (systems.count == 1) {
+            return systems.first!
+        }
+
+        if let chosenSystem = userChosenSystem {
+
+            var target:PVSystem? = nil
+
+            for system in systems {
+                if (chosenSystem.identifier == system.identifier) {
+                    target = system
+                }
+            }
+
+            return target
+        }
+
+        return nil
+    }
+
+    private var cache = Cache()
+}

PVLibrary/Sources/PVLibrary/Importer/Services/GameImporter/MatchHashType.swift → PVLibrary/Sources/PVLibrary/Importer/Models/MatchHashType.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-enum MatchHashType: String, Codable, Equatable, Hashable, Sendable {
+package enum MatchHashType: String, Codable, Equatable, Hashable, Sendable {
     case MD5
     case CRC
     case SHA1

PVLibrary/Sources/PVLibrary/Importer/Services/GameImporter/MatchType.swift → PVLibrary/Sources/PVLibrary/Importer/Models/MatchType.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-enum MatchType: Sendable {
+package enum MatchType: Sendable {
     case byExtension
     case byHash(MatchHashType)
     case byFolder