Major restructuring of theme/syntax handling

src/bin/bat/assets.rs

@@ -0,0 +1,37 @@
+use std::borrow::Cow;
+use std::fs;
+use std::path::PathBuf;
+
+use crate::directories::PROJECT_DIRS;
+
+use bat::assets::HighlightingAssets;
+
+fn theme_set_path() -> PathBuf {
+    PROJECT_DIRS.cache_dir().join("themes.bin")
+}
+
+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 cache_dir() -> Cow<'static, str> {
+    PROJECT_DIRS.cache_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");
+}
+
+pub fn assets_from_cache_or_binary() -> HighlightingAssets {
+    HighlightingAssets::from_cache(&theme_set_path(), &syntax_set_path()).unwrap_or(HighlightingAssets::from_binary())
+}

src/bin/bat/config.rs

@@ -5,7 +5,7 @@ use std::path::PathBuf;
 
 use shell_words;
 
-use bat::dirs::PROJECT_DIRS;
+use crate::directories::PROJECT_DIRS;
 
 pub fn config_file() -> PathBuf {
     env::var("BAT_CONFIG_PATH")

src/bin/bat/directories.rs

@@ -0,0 +1,67 @@
+use std::env;
+use std::path::{Path, PathBuf};
+
+use dirs;
+use lazy_static::lazy_static;
+
+/// Wrapper for 'dirs' that treats MacOS more like Linux, by following the XDG specification.
+/// This means that the `XDG_CACHE_HOME` and `XDG_CONFIG_HOME` environment variables are
+/// checked first. The fallback directories are `~/.cache/bat` and `~/.config/bat`, respectively.
+pub struct BatProjectDirs {
+    cache_dir: PathBuf,
+    config_dir: PathBuf,
+}
+
+impl BatProjectDirs {
+    fn new() -> Option<BatProjectDirs> {
+        let cache_dir = BatProjectDirs::get_cache_dir()?;
+
+        #[cfg(target_os = "macos")]
+        let config_dir_op = env::var_os("XDG_CONFIG_HOME")
+            .map(PathBuf::from)
+            .filter(|p| p.is_absolute())
+            .or_else(|| dirs::home_dir().map(|d| d.join(".config")));
+
+        #[cfg(not(target_os = "macos"))]
+        let config_dir_op = dirs::config_dir();
+
+        let config_dir = config_dir_op.map(|d| d.join("bat"))?;
+
+        Some(BatProjectDirs {
+            cache_dir,
+            config_dir,
+        })
+    }
+
+    pub fn get_cache_dir() -> Option<PathBuf> {
+        // on all OS prefer BAT_CACHE_PATH if set
+        let cache_dir_op = env::var_os("BAT_CACHE_PATH").map(PathBuf::from);
+        if cache_dir_op.is_some() {
+            return cache_dir_op;
+        }
+
+        #[cfg(target_os = "macos")]
+        let cache_dir_op = env::var_os("XDG_CACHE_HOME")
+            .map(PathBuf::from)
+            .filter(|p| p.is_absolute())
+            .or_else(|| dirs::home_dir().map(|d| d.join(".cache")));
+
+        #[cfg(not(target_os = "macos"))]
+        let cache_dir_op = dirs::cache_dir();
+
+        cache_dir_op.map(|d| d.join("bat"))
+    }
+
+    pub fn cache_dir(&self) -> &Path {
+        &self.cache_dir
+    }
+
+    pub fn config_dir(&self) -> &Path {
+        &self.config_dir
+    }
+}
+
+lazy_static! {
+    pub static ref PROJECT_DIRS: BatProjectDirs =
+        BatProjectDirs::new().expect("Could not get home directory");
+}

src/bin/bat/main.rs

@@ -4,9 +4,13 @@
 #[macro_use]
 extern crate clap;
 
+extern crate dirs as dirs_rs;
+
 mod app;
 mod clap_app;
 mod config;
+mod directories;
+mod assets;
 
 use std::collections::HashSet;
 use std::ffi::OsStr;
@@ -19,10 +23,12 @@ use ansi_term::Colour::Green;
 use ansi_term::Style;
 
 use crate::{app::App, config::config_file};
+use directories::PROJECT_DIRS;
+use assets::{cache_dir, clear_assets, config_dir, assets_from_cache_or_binary};
 use bat::controller::Controller;
 
 use bat::{
-    assets::{cache_dir, clear_assets, config_dir, HighlightingAssets},
+    assets::HighlightingAssets,
     errors::*,
     inputfile::InputFile,
     style::{OutputComponent, OutputComponents},
@@ -31,8 +37,8 @@ use bat::{
 
 fn run_cache_subcommand(matches: &clap::ArgMatches) -> Result<()> {
     if matches.is_present("build") {
-        let source_dir = matches.value_of("source").map(Path::new);
-        let target_dir = matches.value_of("target").map(Path::new);
+        let source_dir = matches.value_of("source").map(Path::new).unwrap_or_else(|| PROJECT_DIRS.config_dir());
+        let target_dir = matches.value_of("target").map(Path::new).unwrap_or_else(|| PROJECT_DIRS.cache_dir());
 
         let blank = matches.is_present("blank");
 
@@ -46,7 +52,7 @@ fn run_cache_subcommand(matches: &clap::ArgMatches) -> Result<()> {
 }
 
 pub fn list_languages(config: &Config) -> Result<()> {
-    let assets = HighlightingAssets::new();
+    let assets = assets_from_cache_or_binary();
     let mut languages = assets
         .syntax_set
         .syntaxes()
@@ -109,7 +115,7 @@ pub fn list_languages(config: &Config) -> Result<()> {
 }
 
 pub fn list_themes(cfg: &Config) -> Result<()> {
-    let assets = HighlightingAssets::new();
+    let assets = assets_from_cache_or_binary();
     let themes = &assets.theme_set.themes;
     let mut config = cfg.clone();
     let mut style = HashSet::new();
@@ -141,7 +147,7 @@ pub fn list_themes(cfg: &Config) -> Result<()> {
 }
 
 fn run_controller(config: &Config) -> Result<bool> {
-    let assets = HighlightingAssets::new();
+    let assets = assets_from_cache_or_binary();
     let controller = Controller::new(&config, &assets);
     controller.run()
 }