Refactor importer lookup

Author: STREGA

Sources/GateEngine/Resources/Animation/ObjectAnimation3D.swift

@@ -459,12 +459,10 @@ public final class ObjectAnimation3DBackend {
 
 // MARK: - Resource Manager
 
-public protocol ObjectAnimation3DImporter: AnyObject {
+public protocol ObjectAnimation3DImporter: ResourceImporter {
     init()
 
     func process(data: Data, baseURL: URL, options: ObjectAnimation3DImporterOptions) async throws -> ObjectAnimation3DBackend
-
-    static func supportedFileExtensions() -> [String]
 }
 
 public struct ObjectAnimation3DImporterOptions: Equatable, Hashable, Sendable {
@@ -486,16 +484,14 @@ extension ResourceManager {
         }
         importers.objectAnimation3DImporters.insert(type, at: 0)
     }
-
-    fileprivate func importerForFileType(_ file: String) -> (any ObjectAnimation3DImporter)? {
+    
+    func objectAnimation3DImporterForPath(_ path: String) async throws(GateEngineError) -> any ObjectAnimation3DImporter {
         for type in self.importers.objectAnimation3DImporters {
-            if type.supportedFileExtensions().contains(where: {
-                $0.caseInsensitiveCompare(file) == .orderedSame
-            }) {
-                return type.init()
+            if type.canProcessFile(path) {
+                return try await self.importers.getImporter(path: path, type: type)
             }
         }
-        return nil
+        throw .custom(category: "\(Self.self)", message: "No ObjectAnimation3DImporter could be found for \(path)")
     }
 }
 
@@ -622,12 +618,7 @@ extension ResourceManager {
             let path = key.requestedPath
 
             do {
-                guard let fileExtension = path.components(separatedBy: ".").last else {
-                    throw GateEngineError.failedToLoad(resource: path, "Unknown file type.")
-                }
-                guard let importer: any ObjectAnimation3DImporter = Game.unsafeShared.resourceManager.importerForFileType(fileExtension) else {
-                    throw GateEngineError.failedToLoad(resource: path, "No ObjectAnimation3DImporter for \(fileExtension).")
-                }
+                let importer: any ObjectAnimation3DImporter = try await Game.unsafeShared.resourceManager.objectAnimation3DImporterForPath(path)
 
                 let data = try await Platform.current.loadResource(from: path)
                 let backend = try await importer.process(

Sources/GateEngine/Resources/CollisionMesh/CollisionMesh.swift

@@ -165,13 +165,13 @@ extension ResourceManager {
         importers.collisionMeshImporters.insert(type, at: 0)
     }
 
-    fileprivate func importerForFileType(_ file: String) async throws -> (any CollisionMeshImporter)? {
+    func collisionMeshImporterForPath(_ path: String) async throws(GateEngineError) -> any CollisionMeshImporter {
         for type in self.importers.collisionMeshImporters {
-            if type.canProcessFile(file) {
-                return try await self.importers.getImporter(path: file, type: type)
+            if type.canProcessFile(path) {
+                return try await self.importers.getImporter(path: path, type: type)
             }
         }
-        return nil
+        throw .custom(category: "\(Self.self)", message: "No CollisionMeshImporter could be found for \(path)")
     }
 }
 
@@ -287,12 +287,9 @@ extension ResourceManager {
             let path = key.requestedPath
 
             do {
-                guard let importer: any CollisionMeshImporter = try await Game.unsafeShared.resourceManager.importerForFileType(path) else {
-                    throw GateEngineError.failedToLoad(resource: path, "No CollisionMeshImporter for \(URL(fileURLWithPath: path).pathExtension).")
-                }
-
+                let importer: any CollisionMeshImporter = try await Game.unsafeShared.resourceManager.collisionMeshImporterForPath(path)
                 let rawCollisionMesh = try await importer.loadCollisionMesh(options: key.collisionMeshOptions)
-
+                
                 Task { @MainActor in
                     if let cache = cache.collisionMeshes[key] {
                         cache.collisionMeshBackend = CollisionMeshBackend(rawCollisionMesh: rawCollisionMesh)

Sources/GateEngine/Resources/Tiles/TileMap.swift

@@ -248,13 +248,13 @@ extension ResourceManager {
         importers.tileMapImporters.insert(type, at: 0)
     }
 
-    fileprivate func importerForFileType(_ file: String) async throws -> (any TileMapImporter)? {
+    func tileMapImporterForPath(_ path: String) async throws(GateEngineError) -> any TileMapImporter {
         for type in self.importers.tileMapImporters {
-            if type.canProcessFile(file) {
-                return try await self.importers.getImporter(path: file, type: type)
+            if type.canProcessFile(path) {
+                return try await self.importers.getImporter(path: path, type: type)
             }
         }
-        return nil
+        throw .custom(category: "\(Self.self)", message: "No TileMapImporter could be found for \(path)")
     }
 }
 
@@ -369,12 +369,7 @@ extension ResourceManager {
             let path = key.requestedPath
 
             do {
-                guard 
-                    let importer: any TileMapImporter = try await Game.unsafeShared.resourceManager.importerForFileType(path)
-                else {
-                    throw GateEngineError.failedToLoad(resource: path, "No TileMapImporter for \(URL(fileURLWithPath: path).pathExtension).")
-                }
-
+                let importer: any TileMapImporter = try await Game.unsafeShared.resourceManager.tileMapImporterForPath(path)
                 let backend = try await importer.loadTileMap(options: key.tileMapOptions)
 
                 Task { @MainActor in

Sources/GateEngine/Resources/Tiles/TileSet.swift

@@ -175,13 +175,13 @@ extension ResourceManager {
         importers.tileSetImporters.insert(type, at: 0)
     }
 
-    fileprivate func importerForFileType(_ file: String) async throws -> (any TileSetImporter)? {
+    func tileSetImporterForPath(_ path: String) async throws(GateEngineError) -> any TileSetImporter {
         for type in self.importers.tileSetImporters {
-            if type.canProcessFile(file) {
-                return try await self.importers.getImporter(path: file, type: type)
+            if type.canProcessFile(path) {
+                return try await self.importers.getImporter(path: path, type: type)
             }
         }
-        return nil
+        throw .custom(category: "\(Self.self)", message: "No TileSetImporter could be found for \(path)")
     }
 }
 
@@ -300,10 +300,7 @@ extension ResourceManager {
             let path = key.requestedPath
 
             do {
-                guard let importer: any TileSetImporter = try await Game.unsafeShared.resourceManager.importerForFileType(path) else {
-                    throw GateEngineError.failedToLoad(resource: path, "No TileSetImporter for \(URL(fileURLWithPath: path).pathExtension).")
-                }
-
+                let importer: any TileSetImporter = try await Game.unsafeShared.resourceManager.tileSetImporterForPath(path)
                 let backend = try await importer.loadTileSet(options: key.tileSetOptions)
 
                 Task { @MainActor in