From 5c2b5a21c16537eb3bd9f82f7cd92ab42f970b83 Mon Sep 17 00:00:00 2001
From: Roderick van Domburg <roderick@vandomburg.net>
Date: Wed, 5 Jan 2022 16:43:46 +0100
Subject: [PATCH] Fix audio file caching

---
 audio/src/fetch/mod.rs | 2 +-
 core/src/cache.rs      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/audio/src/fetch/mod.rs b/audio/src/fetch/mod.rs
index 9185e14e..5b39dc08 100644
--- a/audio/src/fetch/mod.rs
+++ b/audio/src/fetch/mod.rs
@@ -336,7 +336,7 @@ impl AudioFile {
             debug!("Downloading file {} complete", file_id);
 
             if let Some(cache) = session_.cache() {
-                if let Some(cache_id) = cache.file(file_id) {
+                if let Some(cache_id) = cache.file_path(file_id) {
                     if let Err(e) = cache.save_file(file_id, &mut file) {
                         error!("Error caching file {} to {:?}: {}", file_id, cache_id, e);
                     } else {
diff --git a/core/src/cache.rs b/core/src/cache.rs
index 9484bb16..9b81e943 100644
--- a/core/src/cache.rs
+++ b/core/src/cache.rs
@@ -367,7 +367,7 @@ impl Cache {
         }
     }
 
-    fn file_path(&self, file: FileId) -> Option<PathBuf> {
+    pub fn file_path(&self, file: FileId) -> Option<PathBuf> {
         self.audio_location.as_ref().map(|location| {
             let name = file.to_base16();
             let mut path = location.join(&name[0..2]);
@@ -396,7 +396,7 @@ impl Cache {
         }
     }
 
-    pub fn save_file<F: Read>(&self, file: FileId, contents: &mut F) -> Result<(), Error> {
+    pub fn save_file<F: Read>(&self, file: FileId, contents: &mut F) -> Result<PathBuf, Error> {
         if let Some(path) = self.file_path(file) {
             if let Some(parent) = path.parent() {
                 if let Ok(size) = fs::create_dir_all(parent)
@@ -407,7 +407,7 @@ impl Cache {
                         limiter.add(&path, size);
                         limiter.prune()?;
                     }
-                    return Ok(());
+                    return Ok(path);
                 }
             }
         }