fix: improve canonicalization behavior

Author: 143mailliw

src/library/scan/discover.rs

@@ -157,11 +157,25 @@ const CLEANUP_PAGE_SIZE: i64 = 1000;
 /// large removals (e.g. an unmounted volume or a big removed folder).
 const CLEANUP_TX_CHUNK: usize = 500;
 
-/// Canonicalize a path, falling back to the original when it can't be resolved (e.g. the
-/// directory was removed from disk). Stored paths in the scan record are already canonical, so if
-/// we have a file in the record (and it doesn't exist any more) it should still work.
+/// Canonicalize a path. When it can't be resolved directly (e.g. a removed folder or an unplugged
+/// drive), canonicalize the nearest existing ancestor and re-append the rest, so symlinked
+/// prefixes still resolve and the result stays comparable with stored paths, which are canonical.
+/// Falls back to the original path when no ancestor resolves.
 fn canonicalize_or_keep(path: &Utf8Path) -> Utf8PathBuf {
-    path.canonicalize_utf8().unwrap_or_else(|_| path.to_owned())
+    if let Ok(canonical) = path.canonicalize_utf8() {
+        return canonical;
+    }
+    let mut current = path.parent();
+    while let Some(ancestor) = current {
+        if let Ok(canonical) = ancestor.canonicalize_utf8() {
+            let tail = path
+                .strip_prefix(ancestor)
+                .expect("ancestor is a prefix of path");
+            return canonical.join(tail);
+        }
+        current = ancestor.parent();
+    }
+    path.to_owned()
 }
 
 /// Remove tracks that no longer belong in the library (deleted, moved, etc). Uses both the scan

src/services/controllers/windows.rs

@@ -60,48 +60,47 @@ impl WindowsController {
         }))?;
 
         let bridge = self.bridge.clone();
-        self.controls.PlaybackPositionChangeRequested(&TypedEventHandler::<
-            SystemMediaTransportControls,
-            PlaybackPositionChangeRequestedEventArgs,
-        >::new(move |_, args| {
-            let position = args
-                .as_ref()
-                .unwrap()
-                .RequestedPlaybackPosition()
-                .unwrap();
+        self.controls
+            .PlaybackPositionChangeRequested(&TypedEventHandler::<
+                SystemMediaTransportControls,
+                PlaybackPositionChangeRequestedEventArgs,
+            >::new(move |_, args| {
+                let position = args.as_ref().unwrap().RequestedPlaybackPosition().unwrap();
 
-            // TimeSpan is measured in 100ns intervals
-            bridge.seek(position.Duration as f64 / 10_000_000.0);
+                // TimeSpan is measured in 100ns intervals
+                bridge.seek(position.Duration as f64 / 10_000_000.0);
 
-            Ok(())
-        }))?;
+                Ok(())
+            }))?;
 
         let bridge = self.bridge.clone();
-        self.controls.ShuffleEnabledChangeRequested(&TypedEventHandler::<
-            SystemMediaTransportControls,
-            ShuffleEnabledChangeRequestedEventArgs,
-        >::new(move |_, _| {
-            // TODO: do better than this
-            bridge.toggle_shuffle();
+        self.controls
+            .ShuffleEnabledChangeRequested(&TypedEventHandler::<
+                SystemMediaTransportControls,
+                ShuffleEnabledChangeRequestedEventArgs,
+            >::new(move |_, _| {
+                // TODO: do better than this
+                bridge.toggle_shuffle();
 
-            Ok(())
-        }))?;
+                Ok(())
+            }))?;
 
         let bridge = self.bridge.clone();
-        self.controls.AutoRepeatModeChangeRequested(&TypedEventHandler::<
-            SystemMediaTransportControls,
-            AutoRepeatModeChangeRequestedEventArgs,
-        >::new(move |_, args| {
-            let mode = args.as_ref().unwrap().RequestedAutoRepeatMode().unwrap();
-
-            bridge.set_repeat(match mode {
-                MediaPlaybackAutoRepeatMode::List => RepeatState::Repeating,
-                MediaPlaybackAutoRepeatMode::Track => RepeatState::RepeatingOne,
-                _ => RepeatState::NotRepeating,
-            });
-
-            Ok(())
-        }))?;
+        self.controls
+            .AutoRepeatModeChangeRequested(&TypedEventHandler::<
+                SystemMediaTransportControls,
+                AutoRepeatModeChangeRequestedEventArgs,
+            >::new(move |_, args| {
+                let mode = args.as_ref().unwrap().RequestedAutoRepeatMode().unwrap();
+
+                bridge.set_repeat(match mode {
+                    MediaPlaybackAutoRepeatMode::List => RepeatState::Repeating,
+                    MediaPlaybackAutoRepeatMode::Track => RepeatState::RepeatingOne,
+                    _ => RepeatState::NotRepeating,
+                });
+
+                Ok(())
+            }))?;
 
         Ok(())
     }

src/settings/scan.rs

@@ -48,7 +48,9 @@ fn retrieve_default_paths() -> Vec<Utf8PathBuf> {
         let folders = match folders {
             Ok(folders) => folders,
             Err(e) => {
-                warn!("Couldn't retrieve the Music library ({e}): nothing will be scanned by default.");
+                warn!(
+                    "Couldn't retrieve the Music library ({e}): nothing will be scanned by default."
+                );
                 return vec![];
             }
         };