Let CopyProcessor mapping return nil too

...to discard a track
fwcd · Apr 30, 2024 · 91bd57d · 91bd57d
1 parent 44de5fd
commit 91bd57d
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/Sources/MusicLibrary/Process/CopyProcessor.swift b/Sources/MusicLibrary/Process/CopyProcessor.swift
@@ -2,7 +2,7 @@ import Foundation
 
 /// A library processor copying tracks to a location using a provided mapping.
 public struct CopyProcessor: LibraryProcessor {
-    private let mapping: (Track) -> URL
+    private let mapping: (Track) -> URL?
 
     public init(mapping: @escaping (Track) -> URL) {
         self.mapping = mapping
@@ -14,19 +14,18 @@ public struct CopyProcessor: LibraryProcessor {
         }
 
         var newTracks: [Int: Track] = [:]
-        for (id, track) in library.tracks {
+        for (i, (id, track)) in library.tracks.enumerated() {
             let oldURL = track.url
             let newURL = mapping(track)
 
-            progress.increment(message: "Copying to \(newURL)...")
-
-            if let oldURL {
+            if let newURL, let oldURL {
+                progress.update(current: i, message: "Copying to \(newURL)...")
                 try FileManager.default.copyItem(at: oldURL, to: newURL)
-            }
 
-            var newTrack = track
-            newTrack.url = newURL
-            newTracks[id] = newTrack
+                var newTrack = track
+                newTrack.url = newURL
+                newTracks[id] = newTrack
+            }
         }
 
         library.tracks = newTracks