Improve path handling on windows

Author: StirlingMouse

.github/workflows/windows-publish.yml

@@ -32,15 +32,18 @@ jobs:
         with:
           targets: ${{ matrix.target }}
 
-      - uses: shogo82148/actions-setup-perl@v1
-        with:
-          perl-version: "5.32"
-          distribution: strawberry
-
-      - name: Build
-        run: |
-          cargo install cargo-packager
-          cargo packager --release
+      - uses: shogo82148/actions-setup-perl@v1
+        with:
+          perl-version: "5.32"
+          distribution: strawberry
+
+      - name: Test
+        run: cargo test -p mlm
+
+      - name: Build
+        run: |
+          cargo install cargo-packager
+          cargo packager --release
 
       - name: Prepare files
         shell: bash

server/src/linker.rs

@@ -484,7 +484,7 @@ async fn link_torrent(
                 debug!("Skiping \"{}\"", file.name);
                 continue;
             }
-            let torrent_path = PathBuf::from(&file.name);
+            let torrent_path = qbit_file_path(&file.name);
             let mut path_components = torrent_path.components();
             let file_name = path_components.next_back().unwrap();
             let dir_name = path_components.next_back().and_then(|dir_name| {
@@ -505,8 +505,8 @@ async fn link_torrent(
             };
             let library_path = dir.join(&file_path);
             library_files.push(file_path.clone());
-            let download_path =
-                map_path(&qbit_config.path_mapping, &torrent.save_path).join(&file.name);
+            let download_path = map_path(&qbit_config.path_mapping, &torrent.save_path)
+                .join(&torrent_path);
             match library.method() {
                 LibraryLinkMethod::Hardlink => {
                     hard_link(&download_path, &library_path, &file_path)?
@@ -700,14 +700,16 @@ fn select_format(
 #[instrument(skip_all)]
 fn hard_link(download_path: &Path, library_path: &Path, file_path: &Path) -> Result<()> {
     debug!("linking: {:?} -> {:?}", download_path, library_path);
-    fs::hard_link(download_path, library_path)
+    let download_fs_path = windows_fs_path(download_path);
+    let library_fs_path = windows_fs_path(library_path);
+    fs::hard_link(&download_fs_path, &library_fs_path)
         .map_err(|err| link_not_found_diagnostics(err, "hardlink", download_path, library_path))
         .or_else(|err| {
             if err.kind() == ErrorKind::AlreadyExists {
                 trace!("AlreadyExists: {}", err);
-                let download_id = get_file_id(download_path);
+                let download_id = get_file_id(&download_fs_path);
                 trace!("got 1: {download_id:?}");
-                let library_id = get_file_id(library_path);
+                let library_id = get_file_id(&library_fs_path);
                 trace!("got 2: {library_id:?}");
                 if let (Ok(download_id), Ok(library_id)) = (download_id, library_id) {
                     trace!("got both");
@@ -719,8 +721,8 @@ fn hard_link(download_path: &Path, library_path: &Path, file_path: &Path) -> Res
                         bail!(
                             "File \"{:?}\" already exists, torrent file size: {}, library file size: {}",
                             file_path,
-                            fs::metadata(download_path).map_or("?".to_string(), |s| Size::from_bytes(file_size(&s)).to_string()),
-                            fs::metadata(library_path).map_or("?".to_string(), |s| Size::from_bytes(file_size(&s)).to_string())
+                            fs::metadata(&download_fs_path).map_or("?".to_string(), |s| Size::from_bytes(file_size(&s)).to_string()),
+                            fs::metadata(&library_fs_path).map_or("?".to_string(), |s| Size::from_bytes(file_size(&s)).to_string())
                         );
                     }
                 }
@@ -733,7 +735,9 @@ fn hard_link(download_path: &Path, library_path: &Path, file_path: &Path) -> Res
 #[instrument(skip_all)]
 fn copy(download_path: &Path, library_path: &Path) -> Result<()> {
     debug!("copying: {:?} -> {:?}", download_path, library_path);
-    fs::copy(download_path, library_path)
+    let download_fs_path = windows_fs_path(download_path);
+    let library_fs_path = windows_fs_path(library_path);
+    fs::copy(&download_fs_path, &library_fs_path)
         .map_err(|err| link_not_found_diagnostics(err, "copy", download_path, library_path))?;
     Ok(())
 }
@@ -812,6 +816,37 @@ fn first_missing_component(path: &Path) -> Option<PathBuf> {
     None
 }
 
+fn qbit_file_path(file_name: &str) -> PathBuf {
+    let mut path = PathBuf::new();
+    for part in file_name.split(['/', '\\']) {
+        if part.is_empty() || part == "." {
+            continue;
+        }
+        path.push(part);
+    }
+    path
+}
+
+#[cfg(target_family = "windows")]
+fn windows_fs_path(path: &Path) -> PathBuf {
+    if !path.is_absolute() {
+        return path.to_path_buf();
+    }
+    let path_str = path.as_os_str().to_string_lossy();
+    if path_str.starts_with(r"\\?\") {
+        return path.to_path_buf();
+    }
+    if let Some(without_unc) = path_str.strip_prefix(r"\\") {
+        return PathBuf::from(format!(r"\\?\UNC\{without_unc}"));
+    }
+    PathBuf::from(format!(r"\\?\{path_str}"))
+}
+
+#[cfg(not(target_family = "windows"))]
+fn windows_fs_path(path: &Path) -> PathBuf {
+    path.to_path_buf()
+}
+
 pub fn file_size(m: &Metadata) -> u64 {
     #[cfg(target_family = "unix")]
     return m.size();
@@ -854,4 +889,59 @@ mod tests {
             PathBuf::from("/ebooks/torrent")
         );
     }
+
+    #[test]
+    fn test_qbit_file_path_mixed_separators() {
+        assert_eq!(
+            qbit_file_path(r"Isaac Asimov AudioBook Collection/Book 01\CD 07/Track01.mp3"),
+            PathBuf::from("Isaac Asimov AudioBook Collection")
+                .join("Book 01")
+                .join("CD 07")
+                .join("Track01.mp3")
+        );
+    }
+
+    #[test]
+    fn test_qbit_file_path_ignores_empty_and_dot_segments() {
+        assert_eq!(
+            qbit_file_path(r"/Book 01//./CD 07\.\Track01.mp3"),
+            PathBuf::from("Book 01")
+                .join("CD 07")
+                .join("Track01.mp3")
+        );
+    }
+
+    #[cfg(target_family = "windows")]
+    #[test]
+    fn test_windows_fs_path_drive_prefix() {
+        let path = PathBuf::from(r"F:\Sharon\Media\Audio\Hardlinks\file.m4b");
+        assert_eq!(
+            windows_fs_path(&path),
+            PathBuf::from(r"\\?\F:\Sharon\Media\Audio\Hardlinks\file.m4b")
+        );
+    }
+
+    #[cfg(target_family = "windows")]
+    #[test]
+    fn test_windows_fs_path_unc_prefix() {
+        let path = PathBuf::from(r"\\server\share\Audio\file.m4b");
+        assert_eq!(
+            windows_fs_path(&path),
+            PathBuf::from(r"\\?\UNC\server\share\Audio\file.m4b")
+        );
+    }
+
+    #[cfg(target_family = "windows")]
+    #[test]
+    fn test_windows_fs_path_preserves_existing_extended_prefix() {
+        let path = PathBuf::from(r"\\?\F:\Sharon\Media\Audio\Hardlinks\file.m4b");
+        assert_eq!(windows_fs_path(&path), path);
+    }
+
+    #[cfg(not(target_family = "windows"))]
+    #[test]
+    fn test_windows_fs_path_noop_on_non_windows() {
+        let path = PathBuf::from("/tmp/test/file.m4b");
+        assert_eq!(windows_fs_path(&path), path);
+    }
 }