chore: fix typed-path with encoding (#568)

* chore: fix typed-path with encoding * add helper for converting typed path to platform path
vnghia · Dec 11, 2024 · 1d4f5bf · 1d4f5bf
1 parent f7a8825
commit 1d4f5bf
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 24 deletions.
diff --git a/nghe-backend/src/config/cover_art.rs b/nghe-backend/src/config/cover_art.rs
@@ -17,8 +17,7 @@ pub struct CoverArt {
                 .join("nghe")
                 .join("cache")
                 .join("cover_art")
-                .with_platform_encoding_checked()
-                .unwrap()
+                .with_platform_encoding()
         )
     ))]
     pub dir: Option<Utf8PlatformPathBuf>,

diff --git a/nghe-backend/src/config/integration/mod.rs b/nghe-backend/src/config/integration/mod.rs
@@ -20,8 +20,7 @@ pub struct Spotify {
                 .join("nghe")
                 .join("spotify")
                 .join("token.json")
-                .with_platform_encoding_checked()
-                .unwrap()
+                .with_platform_encoding()
         )
     ))]
     pub token_path: Option<Utf8PlatformPathBuf>,

diff --git a/nghe-backend/src/config/server.rs b/nghe-backend/src/config/server.rs
@@ -18,8 +18,7 @@ pub struct Server {
             .unwrap()
             .join("frontend")
             .join("dist")
-            .with_platform_encoding_checked()
-            .unwrap()
+            .with_platform_encoding()
     ))]
     pub frontend_dir: Utf8PlatformPathBuf,
 }

diff --git a/nghe-backend/src/config/transcode.rs b/nghe-backend/src/config/transcode.rs
@@ -21,8 +21,7 @@ pub struct Transcode {
                 .join("nghe")
                 .join("cache")
                 .join("transcode")
-                .with_platform_encoding_checked()
-                .unwrap()
+                .with_platform_encoding()
         )
     ))]
     pub cache_dir: Option<Utf8PlatformPathBuf>,

diff --git a/nghe-backend/src/filesystem/local.rs b/nghe-backend/src/filesystem/local.rs
@@ -3,7 +3,7 @@ use std::fs::Metadata;
 use async_walkdir::WalkDir;
 use futures_lite::stream::StreamExt;
 use time::OffsetDateTime;
-use typed_path::Utf8TypedPath;
+use typed_path::{Utf8PlatformPathBuf, Utf8TypedPath};
 
 use super::{entry, path};
 use crate::file::{self, audio};
@@ -15,19 +15,38 @@ pub struct Filesystem;
 
 impl Filesystem {
     #[cfg(windows)]
-    fn is_native(path: &Utf8TypedPath<'_>) -> bool {
+    fn is_native(path: Utf8TypedPath<'_>) -> bool {
         path.is_windows()
     }
 
     #[cfg(unix)]
-    fn is_native(path: &Utf8TypedPath<'_>) -> bool {
+    fn is_native(path: Utf8TypedPath<'_>) -> bool {
         path.is_unix()
     }
+
+    pub fn to_platform(path: Utf8TypedPath<'_>) -> Result<Utf8PlatformPathBuf, Error> {
+        match path {
+            Utf8TypedPath::Unix(unix_path) => {
+                if cfg!(unix) {
+                    Ok(unix_path.with_platform_encoding())
+                } else {
+                    error::Kind::InvalidTypedPathPlatform(path.to_path_buf()).into()
+                }
+            }
+            Utf8TypedPath::Windows(windows_path) => {
+                if cfg!(windows) {
+                    Ok(windows_path.with_platform_encoding())
+                } else {
+                    error::Kind::InvalidTypedPathPlatform(path.to_path_buf()).into()
+                }
+            }
+        }
+    }
 }
 
 impl super::Trait for Filesystem {
     async fn check_folder(&self, path: Utf8TypedPath<'_>) -> Result<(), Error> {
-        if !Self::is_native(&path) {
+        if !Self::is_native(path) {
             error::Kind::InvalidTypedPathPlatform(path.to_path_buf()).into()
         } else if !path.is_absolute() {
             error::Kind::InvalidAbsolutePath(path.to_path_buf()).into()
@@ -81,12 +100,7 @@ impl super::Trait for Filesystem {
         source: &binary::Source<file::Property<audio::Format>>,
         offset: Option<u64>,
     ) -> Result<binary::Response, Error> {
-        let path = match source.path.to_path() {
-            Utf8TypedPath::Unix(path) => path.with_platform_encoding_checked(),
-            Utf8TypedPath::Windows(path) => path.with_platform_encoding_checked(),
-        }
-        .map_err(|_| error::Kind::InvalidTypedPathPlatform(source.path.clone()))?;
-
+        let path = Self::to_platform(source.path.to_path())?;
         binary::Response::from_path_property(
             path,
             &source.property,

diff --git a/nghe-backend/src/test/filesystem/mod.rs b/nghe-backend/src/test/filesystem/mod.rs
@@ -4,7 +4,7 @@ mod s3;
 
 pub use common::{Impl, Trait};
 use nghe_api::common::filesystem;
-use typed_path::{Utf8PlatformPathBuf, Utf8TypedPath};
+use typed_path::Utf8PlatformPathBuf;
 
 use crate::filesystem::Filesystem;
 
@@ -35,10 +35,6 @@ impl Mock {
     }
 
     pub fn prefix(&self) -> Utf8PlatformPathBuf {
-        match self.local.prefix() {
-            Utf8TypedPath::Unix(path) => path.with_platform_encoding_checked(),
-            Utf8TypedPath::Windows(path) => path.with_platform_encoding_checked(),
-        }
-        .unwrap()
+        crate::filesystem::local::Filesystem::to_platform(self.local.prefix()).unwrap()
     }
 }