De-duplicate some themes.bin and syntaxes.bin related code

2 files changed, 42 insertions, 64 deletions

diff --git a/src/assets.rs b/src/assets.rs
index a373b270..79467a82 100644
--- a/src/assets.rs
+++ b/src/assets.rs
@@ -97,30 +97,9 @@ impl HighlightingAssets {
     }
 
     pub fn from_cache(cache_path: &Path) -> Result<Self> {
-        let syntax_set_path = cache_path.join("syntaxes.bin");
-        let theme_set_path = cache_path.join("themes.bin");
-
-        let syntax_set_file = File::open(&syntax_set_path).chain_err(|| {
-            format!(
-                "Could not load cached syntax set '{}'",
-                syntax_set_path.to_string_lossy()
-            )
-        })?;
-        let syntax_set: SyntaxSet = from_reader(BufReader::new(syntax_set_file))
-            .chain_err(|| "Could not parse cached syntax set")?;
-
-        let theme_set_file = File::open(&theme_set_path).chain_err(|| {
-            format!(
-                "Could not load cached theme set '{}'",
-                theme_set_path.to_string_lossy()
-            )
-        })?;
-        let theme_set: ThemeSet = from_reader(BufReader::new(theme_set_file))
-            .chain_err(|| "Could not parse cached theme set")?;
-
         Ok(HighlightingAssets {
-            syntax_set,
-            theme_set,
+            syntax_set: asset_from_cache(&cache_path.join("syntaxes.bin"), "syntax set")?,
+            theme_set: asset_from_cache(&cache_path.join("themes.bin"), "theme set")?,
             fallback_theme: None,
         })
     }
@@ -146,32 +125,12 @@ impl HighlightingAssets {
 
     pub fn save_to_cache(&self, target_dir: &Path, current_version: &str) -> Result<()> {
         let _ = fs::create_dir_all(target_dir);
-        let theme_set_path = target_dir.join("themes.bin");
-        let syntax_set_path = target_dir.join("syntaxes.bin");
-
-        print!(
-            "Writing theme set to {} ... ",
-            theme_set_path.to_string_lossy()
-        );
-        dump_to_file(&self.theme_set, &theme_set_path).chain_err(|| {
-            format!(
-                "Could not save theme set to {}",
-                theme_set_path.to_string_lossy()
-            )
-        })?;
-        println!("okay");
-
-        print!(
-            "Writing syntax set to {} ... ",
-            syntax_set_path.to_string_lossy()
-        );
-        dump_to_file(&self.syntax_set, &syntax_set_path).chain_err(|| {
-            format!(
-                "Could not save syntax set to {}",
-                syntax_set_path.to_string_lossy()
-            )
-        })?;
-        println!("okay");
+        asset_to_cache(&self.theme_set, &target_dir.join("themes.bin"), "theme set")?;
+        asset_to_cache(
+            &self.syntax_set,
+            &target_dir.join("syntaxes.bin"),
+            "syntax set",
+        )?;
 
         print!(
             "Writing metadata to folder {} ... ",
@@ -319,6 +278,31 @@ impl HighlightingAssets {
     }
 }
 
+fn asset_to_cache<T: serde::Serialize>(asset: &T, path: &Path, description: &str) -> Result<()> {
+    print!("Writing {} to {} ... ", description, path.to_string_lossy());
+    dump_to_file(asset, &path).chain_err(|| {
+        format!(
+            "Could not save {} to {}",
+            description,
+            path.to_string_lossy()
+        )
+    })?;
+    println!("okay");
+    Ok(())
+}
+
+fn asset_from_cache<T: serde::de::DeserializeOwned>(path: &Path, description: &str) -> Result<T> {
+    let asset_file = File::open(&path).chain_err(|| {
+        format!(
+            "Could not load cached {} '{}'",
+            description,
+            path.to_string_lossy()
+        )
+    })?;
+    from_reader(BufReader::new(asset_file))
+        .chain_err(|| format!("Could not parse cached {}", description))
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/src/bin/bat/assets.rs b/src/bin/bat/assets.rs
index ef6484ab..38dce43a 100644
--- a/src/bin/bat/assets.rs
+++ b/src/bin/bat/assets.rs
@@ -18,21 +18,9 @@ pub fn cache_dir() -> Cow<'static, str> {
 }
 
 pub fn clear_assets() {
-    let theme_set_path = PROJECT_DIRS.cache_dir().join("themes.bin");
-    let syntax_set_path = PROJECT_DIRS.cache_dir().join("syntaxes.bin");
-    let metadata_file = PROJECT_DIRS.cache_dir().join("metadata.yaml");
-
-    print!("Clearing theme set cache ... ");
-    fs::remove_file(theme_set_path).ok();
-    println!("okay");
-
-    print!("Clearing syntax set cache ... ");
-    fs::remove_file(syntax_set_path).ok();
-    println!("okay");
-
-    print!("Clearing metadata file ... ");
-    fs::remove_file(metadata_file).ok();
-    println!("okay");
+    clear_asset("themes.bin", "theme set cache");
+    clear_asset("syntaxes.bin", "syntax set cache");
+    clear_asset("metadata.yaml", "metadata file");
 }
 
 pub fn assets_from_cache_or_binary() -> Result<HighlightingAssets> {
@@ -56,3 +44,9 @@ pub fn assets_from_cache_or_binary() -> Result<HighlightingAssets> {
     Ok(HighlightingAssets::from_cache(&cache_dir)
         .unwrap_or_else(|_| HighlightingAssets::from_binary()))
 }
+
+fn clear_asset(filename: &str, description: &str) {
+    print!("Clearing {} ... ", description);
+    fs::remove_file(PROJECT_DIRS.cache_dir().join(filename)).ok();
+    println!("okay");
+}