Feature: File-extension

fixtures/schemes.txt

@@ -155,6 +155,7 @@ base16-mellow-purple
 base16-mexico-light
 base16-mocha
 base16-monokai
+base16-moonlight
 base16-mountain
 base16-nebula
 base16-nord-light
@@ -177,6 +178,10 @@ base16-pico
 base16-pinky
 base16-pop
 base16-porple
+base16-precious-dark-eleven
+base16-precious-dark-fifteen
+base16-precious-light-warm
+base16-precious-light-white
 base16-primer-dark-dimmed
 base16-primer-dark
 base16-primer-light

src/config.rs

@@ -93,6 +93,8 @@ pub struct ConfigItem {
     pub themes_dir: String,
     #[serde(rename = "supported-systems")]
     pub supported_systems: Option<Vec<SupportedSchemeSystems>>,
+    #[serde(rename = "theme-file-extension")]
+    pub theme_file_extension: Option<String>,
 }
 
 impl fmt::Display for ConfigItem {
@@ -171,6 +173,7 @@ impl Config {
             themes_dir: BASE16_SHELL_THEMES_DIR.to_string(),
             hook: Some(BASE16_SHELL_HOOK.to_string()),
             supported_systems: Some(vec![SupportedSchemeSystems::Base16]), // DEFAULT_SCHEME_SYSTEM
+            theme_file_extension: None,
         };
 
         // Add default `item` if no items exist

src/operations/apply.rs

@@ -86,9 +86,16 @@ pub fn apply(config_path: &Path, data_path: &Path, full_scheme_name: &str) -> Re
             .with_context(|| format!("Themes are missing from {}, try running `{} install` or `{} update` and try again.", item.name, REPO_NAME, REPO_NAME))?;
         let theme_option = &theme_dir.filter_map(Result::ok).find(|entry| {
             let path = entry.path();
-            let filename = path.file_stem().and_then(|name| name.to_str());
-
-            full_scheme_name == filename.unwrap_or_default()
+            match &item.theme_file_extension {
+                Some(extension) => {
+                    let filename = path.file_name().and_then(|name| name.to_str());
+                    format!("{}{}", full_scheme_name, extension) == filename.unwrap_or_default()
+                }
+                None => {
+                    let filename = path.file_stem().and_then(|name| name.to_str());
+                    full_scheme_name == filename.unwrap_or_default()
+                }
+            }
         });
 
         // Copy that theme to the data_path or log a message that it isn't found
@@ -113,7 +120,9 @@ pub fn apply(config_path: &Path, data_path: &Path, full_scheme_name: &str) -> Re
                 // Run hook for item if provided
                 if let Some(hook_text) = &item.hook {
                     let hook_script =
-                        hook_text.replace("%f", format!("\"{}\"", data_theme_path.display()).as_str());
+                        hook_text
+                        .replace("%f", format!("\"{}\"", data_theme_path.display()).as_str())
+                        .replace("%n", full_scheme_name);
                     let command_vec =
                         get_shell_command_from_string(config_path, hook_script.as_str())?;
                     Command::new(&command_vec[0])