Cache: fix artwork types

BLeeEZ · May 14, 2024 · 0c6cb2e · 0c6cb2e
1 parent afde421
commit 0c6cb2e
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/AmperfyKit/Storage/CacheFileManager.swift b/AmperfyKit/Storage/CacheFileManager.swift
@@ -44,6 +44,9 @@ public class CacheFileManager {
         if createDirectoryIfNeeded(at: subDir) {
             try? markItemAsExcludedFromBackup(at: subDir)
         }
+        if fileManager.fileExists(atPath: to.path) {
+            try? self.removeItem(at: to)
+        }
         try fileManager.moveItem(at: at, to: to)
         try markItemAsExcludedFromBackup(at: to)
     }
@@ -141,7 +144,11 @@ public class CacheFileManager {
 
     public func createRelPath(for artwork: Artwork) -> URL? {
         guard !artwork.managedObject.id.isEmpty else { return nil }
-        return Self.artworksDir.appendingPathComponent(artwork.managedObject.id)
+        if !artwork.type.isEmpty {
+            return Self.artworksDir.appendingPathComponent(artwork.type).appendingPathComponent(artwork.managedObject.id)
+        } else {
+            return Self.artworksDir.appendingPathComponent(artwork.managedObject.id)
+        }
     }
 
     public func createRelPath(for embeddedArtwork: EmbeddedArtwork) -> URL? {