importer better bios matching by filename

Signed-off-by: Joseph Mattiello <git@joemattiello.com>

Author: JoeMatt

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

@@ -7,38 +7,42 @@
 
 
 extension GameImporter {
-    
-    
+
+
     /// Checks if a given ROM file is a CD-ROM
     internal func isCDROM(_ queueItem: ImportQueueItem) -> Bool {
         return isCDROM(queueItem.url)
     }
-    
+
     /// Checks if a given path is a CD-ROM
     internal func isCDROM(_ path: URL) -> Bool {
         let cdromExtensions: Set<String> = Extensions.discImageExtensions.union(Extensions.playlistExtensions)
         let fileExtension = path.pathExtension.lowercased()
         return cdromExtensions.contains(fileExtension)
     }
-    
+
     /// Checks if a given path is artwork
     internal func isArtwork(_ queueItem: ImportQueueItem) -> Bool {
         let artworkExtensions = Extensions.artworkExtensions
         let fileExtension = queueItem.url.pathExtension.lowercased()
         return artworkExtensions.contains(fileExtension)
     }
-    
+
     internal func isBIOS(_ queueItem: ImportQueueItem) throws -> Bool {
-        guard let md5 = queueItem.md5?.uppercased() else {
-            throw GameImporterError.couldNotCalculateMD5
-        }
-        
-        DLOG("Checking MD5: \(md5) for possible BIOS match")
-        
         // First check if this is a BIOS file by MD5
-        let biosMatches = PVEmulatorConfiguration.biosEntries.filter("expectedMD5 == %@", md5).map({ $0 })
-        
-        //it's a bios if it's md5 matches known BIOS
-        return !biosMatches.isEmpty
+        if let md5 = queueItem.md5?.uppercased() {
+            DLOG("Checking MD5: \(md5) for possible BIOS match")
+            let biosMatches = PVEmulatorConfiguration.biosEntries.filter("expectedMD5 == %@", md5).map({ $0 })
+            if !biosMatches.isEmpty {
+                return true
+            }
+        }
+
+        // If no MD5 match, try matching by filename
+        let filename = queueItem.url.lastPathComponent.lowercased()
+        DLOG("Checking filename: \(filename) for possible BIOS match")
+        let filenameMatches = PVEmulatorConfiguration.biosEntries.filter("expectedFilename == %@", filename).map({ $0 })
+
+        return !filenameMatches.isEmpty
     }
 }

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

@@ -93,35 +93,48 @@ class GameImporterDatabaseService : GameImporterDatabaseServicing {
     }
 
     internal func importBIOSIntoDatabase(queueItem: ImportQueueItem) async throws {
-        guard let destinationUrl = queueItem.destinationUrl,
-            let md5 = queueItem.md5?.uppercased() else {
-            //how did we get here, throw?
+        guard let destinationUrl = queueItem.destinationUrl else {
             throw GameImporterError.incorrectDestinationURL
         }
 
-        // Get all BIOS entries that match this MD5
-        let matchingBIOSEntries:[PVBIOS] = PVEmulatorConfiguration.biosArray.filter { biosEntry in
-            let frozenBiosEntry = biosEntry.isFrozen ? biosEntry : biosEntry.freeze()
-            return frozenBiosEntry.expectedMD5.uppercased() == md5
+        var matchingBIOSEntries: [PVBIOS] = []
+
+        // Try matching by MD5 first
+        if let md5 = queueItem.md5?.uppercased() {
+            matchingBIOSEntries = PVEmulatorConfiguration.biosArray.filter { biosEntry in
+                let frozenBiosEntry = biosEntry.isFrozen ? biosEntry : biosEntry.freeze()
+                return frozenBiosEntry.expectedMD5.uppercased() == md5
+            }
         }
 
-        for biosEntry in matchingBIOSEntries {
-            // Get the first matching system
+        // If no MD5 matches, try matching by filename
+        if matchingBIOSEntries.isEmpty {
+            let filename = queueItem.url.lastPathComponent.lowercased()
+            matchingBIOSEntries = PVEmulatorConfiguration.biosArray.filter { biosEntry in
                 let frozenBiosEntry = biosEntry.isFrozen ? biosEntry : biosEntry.freeze()
+                return frozenBiosEntry.expectedFilename.lowercased() == filename
+            }
+        }
 
-                // Update BIOS entry in Realm
-                try await MainActor.run {
-                    let realm = try Realm()
-                    try realm.write {
-                        if let thawedBios = frozenBiosEntry.thaw() {
-                            let biosFile = PVFile(withURL: destinationUrl)
-                            thawedBios.file = biosFile
-                        }
+        // If we still have no matches, throw an error
+        guard !matchingBIOSEntries.isEmpty else {
+            throw GameImporterError.noSystemMatched
+        }
+
+        // Update each matching BIOS entry in Realm
+        for biosEntry in matchingBIOSEntries {
+            let frozenBiosEntry = biosEntry.isFrozen ? biosEntry : biosEntry.freeze()
+
+            try await MainActor.run {
+                let realm = try Realm()
+                try realm.write {
+                    if let thawedBios = frozenBiosEntry.thaw() {
+                        let biosFile = PVFile(withURL: destinationUrl)
+                        thawedBios.file = biosFile
                     }
                 }
+            }
         }
-
-        return
     }
 
     /// Imports a ROM to the database