Write cached covers to ~/.cache/songrec instead of /tmp/ (issue #214)

Author: marin-m

src/gui/main_window.rs

@@ -26,7 +26,7 @@ use crate::plugins::ksni::SystrayInterface;
 use crate::plugins::mpris_player::{get_player, update_song};
 use crate::utils::csv_song_history::SongHistoryRecord;
 use crate::utils::filesystem_operations::{
-    obtain_favorites_csv_path, obtain_recognition_history_csv_path,
+    clear_cache, obtain_favorites_csv_path, obtain_recognition_history_csv_path,
 };
 
 use crate::gui::preferences::{Preferences, PreferencesInterface};
@@ -281,6 +281,7 @@ impl App {
         set_recording: bool,
         enable_mpris_cli: bool,
     ) {
+        clear_cache();
         self.setup_intercom(application, set_recording, enable_mpris_cli);
         self.setup_actions(application, enable_mpris_cli);
         #[cfg(target_os = "linux")]

src/plugins/mpris_player.rs

@@ -1,3 +1,4 @@
+use log::debug;
 use std::fs;
 use std::panic;
 use std::sync::Arc;
@@ -9,6 +10,7 @@ use std::sync::Arc;
 use mpris_player::{Metadata, MprisPlayer, PlaybackStatus};
 
 use crate::core::thread_messages::SongRecognizedMessage;
+use crate::utils::filesystem_operations::obtain_cache_directory;
 use std::os::unix::fs::MetadataExt;
 use std::time::SystemTime;
 
@@ -87,7 +89,8 @@ pub fn update_song(
         let process_uid = std::fs::metadata("/proc/self")
             .map(|m| m.uid())
             .unwrap_or(0);
-        let mut tmp = std::env::temp_dir();
+        // TODO use cache dir
+        let mut tmp = obtain_cache_directory().unwrap();
         let timestamp = SystemTime::now()
             .duration_since(SystemTime::UNIX_EPOCH)
             .unwrap()
@@ -96,6 +99,7 @@ pub fn update_song(
             "songrec_cover_{}_{}.{}",
             process_uid, timestamp, mime_ext
         ));
+        debug!("Writing cover file to {:?}", tmp);
         if fs::write(&tmp, buf).is_ok() {
             // Use file:// URL for better compatibility with MPRIS clients
             metadata.art_url = Some(format!("file://{}", tmp.display()));

src/utils/filesystem_operations.rs

@@ -60,6 +60,26 @@ fn obtain_preferences_directory(project_directory: ProjectDirs) -> Result<PathBu
     Ok(preferences_dir.to_path_buf())
 }
 
+pub fn obtain_cache_directory() -> Result<PathBuf, Box<dyn Error>> {
+    let project_dir =
+        ProjectDirs::from(QUALIFIER, ORGANIZATION, APPLICATION).ok_or("No valid path")?;
+    let cache_path = project_dir.cache_dir();
+    if !cache_path.exists() {
+        create_dir_all(cache_path)?;
+    }
+    Ok(cache_path.to_path_buf())
+}
+
+pub fn clear_cache() {
+    if let Ok(contents) = std::fs::read_dir(obtain_cache_directory().unwrap()) {
+        for entry in contents {
+            if let Ok(entry) = entry {
+                std::fs::remove_file(entry.path()).ok();
+            }
+        }
+    }
+}
+
 //Backwards compatibility
 fn get_old_data_dir_path() -> Result<PathBuf, Box<dyn Error>> {
     let app_info = AppInfo {