theme: 🔨 try yml if yaml theme file not found

Signed-off-by: zwPapEr <[email protected]>
lsd-rs · Sep 13, 2021 · bb6e7f9 · bb6e7f9
1 parent 9377613
commit bb6e7f9
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/src/color/theme.rs b/src/color/theme.rs
@@ -143,19 +143,30 @@ impl Theme {
             config_file::Config::config_file_path()?
                 .join("themes")
                 .join(real)
-                .with_extension("yaml")
         };
-        match fs::read(&path) {
+        match fs::read(&path.with_extension("yaml")) {
             Ok(f) => match Self::with_yaml(&String::from_utf8_lossy(&f)) {
                 Ok(t) => Some(t),
                 Err(e) => {
                     print_error!("Theme file {} format error: {}.", &file, e);
                     None
                 }
             },
-            Err(e) => {
-                print_error!("Not a valid theme: {}, {}.", path.to_string_lossy(), e);
-                None
+            Err(_) => {
+                // try `yml` if `yaml` extension file not found
+                match fs::read(&path.with_extension("yml")) {
+                    Ok(f) => match Self::with_yaml(&String::from_utf8_lossy(&f)) {
+                        Ok(t) => Some(t),
+                        Err(e) => {
+                            print_error!("Theme file {} format error: {}.", &file, e);
+                            None
+                        }
+                    },
+                    Err(e) => {
+                        print_error!("Not a valid theme: {}, {}.", path.to_string_lossy(), e);
+                        None
+                    }
+                }
             }
         }
     }