Fix for Windows config directory bug (#554)

jpochyla · Nov 9, 2024 · 5fb8918 · 5fb8918
1 parent 0292319
commit 5fb8918
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/psst-gui/Cargo.toml b/psst-gui/Cargo.toml
@@ -24,6 +24,7 @@ log = { version = "0.4.22" }
 lru = { version = "0.12.5" }
 once_cell = { version = "1.20.2" }
 parking_lot = { version = "0.12.3" }
+platform-dirs = { version = "0.3.0" }
 rand = { version = "0.8.5" }
 regex = { version = "1.11.0" }
 serde = { version = "1.0.210", features = ["derive", "rc"] }

diff --git a/psst-gui/src/data/config.rs b/psst-gui/src/data/config.rs
@@ -8,8 +8,8 @@ use std::{
 #[cfg(target_family = "unix")]
 use std::os::unix::fs::OpenOptionsExt;
 
-use directories::ProjectDirs;
 use druid::{Data, Lens, Size};
+use platform_dirs::AppDirs;
 use psst_core::{
     cache::mkdir_if_not_exists,
     connection::Credentials,
@@ -125,23 +125,25 @@ impl Default for Config {
 }
 
 impl Config {
-    fn project_dirs() -> Option<ProjectDirs> {
-        ProjectDirs::from("", "", APP_NAME)
+    fn app_dirs() -> Option<AppDirs> {
+        const USE_XDG_ON_MACOS: bool = false;
+
+        AppDirs::new(Some(APP_NAME), USE_XDG_ON_MACOS)
     }
 
     pub fn spotify_local_files_file(username: &str) -> Option<PathBuf> {
-        ProjectDirs::from("", "", "spotify").map(|dirs| {
+        AppDirs::new(Some("spotify"), false).map(|dir| {
             let path = format!("Users/{}-user/local-files.bnk", username);
-            dirs.config_dir().join(path)
+            dir.config_dir.join(path)
         })
     }
 
     pub fn cache_dir() -> Option<PathBuf> {
-        Self::project_dirs().map(|dirs| dirs.cache_dir().to_path_buf())
+        Self::app_dirs().map(|dirs| dirs.cache_dir)
     }
 
     pub fn config_dir() -> Option<PathBuf> {
-        Self::project_dirs().map(|dirs| dirs.config_dir().to_path_buf())
+        Self::app_dirs().map(|dirs| dirs.config_dir)
     }
 
     fn config_path() -> Option<PathBuf> {