Move asset clearing to assets module

ghuls · May 21, 2018 · 2712d63 · 2712d63
1 parent b21fb6b
commit 2712d63
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/src/assets.rs b/src/assets.rs
@@ -157,14 +157,24 @@ impl HighlightingAssets {
     }
 }
 
-pub fn theme_set_path() -> PathBuf {
+fn theme_set_path() -> PathBuf {
     PROJECT_DIRS.cache_dir().join("themes.bin")
 }
 
-pub fn syntax_set_path() -> PathBuf {
+fn syntax_set_path() -> PathBuf {
     PROJECT_DIRS.cache_dir().join("syntaxes.bin")
 }
 
 pub fn config_dir() -> Cow<'static, str> {
     PROJECT_DIRS.config_dir().to_string_lossy()
 }
+
+pub fn clear_assets() {
+    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");
+}
diff --git a/src/main.rs b/src/main.rs
@@ -27,13 +27,12 @@ mod printer;
 mod style;
 mod terminal;
 
-use std::fs;
 use std::io;
 use std::path::Path;
 use std::process;
 
 use app::App;
-use assets::{config_dir, syntax_set_path, theme_set_path, HighlightingAssets};
+use assets::{clear_assets, config_dir, HighlightingAssets};
 use features::{list_languages, print_files};
 
 mod errors {
@@ -75,13 +74,7 @@ fn run() -> Result<bool> {
                 let assets = HighlightingAssets::from_files(source_dir)?;
                 assets.save(target_dir)?;
             } else if cache_matches.is_present("clear") {
-                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");
+                clear_assets();
             } else if cache_matches.is_present("config-dir") {
                 println!("{}", config_dir());
             }