Update List operation to get list of schemes recursively

This now ignores directory structure

Author: JamyGolden

CHANGELOG.md

@@ -7,6 +7,10 @@
 - Support arguments with `current` subcommand to allow consumers to get
   specific current scheme data
 
+### Changed
+
+- Update `list` operation to get schemes from a directory recursively
+
 ## [0.21.1] - 2024-10-02
 
 ### Fixed

src/operations/list.rs

@@ -1,9 +1,7 @@
-use crate::{
-    constants::{CUSTOM_SCHEMES_DIR_NAME, REPO_DIR, REPO_NAME, SCHEMES_REPO_NAME},
-    utils::get_all_scheme_names,
-};
+use crate::constants::{CUSTOM_SCHEMES_DIR_NAME, REPO_DIR, REPO_NAME, SCHEMES_REPO_NAME};
 use anyhow::{anyhow, Result};
 use std::path::Path;
+use tinted_builder_rust::utils::get_scheme_files;
 
 /// Lists available color schemes
 ///
@@ -32,9 +30,13 @@ pub fn list(data_path: &Path, is_custom: bool) -> Result<()> {
         _ => {}
     }
 
-    let scheme_vec = get_all_scheme_names(&schemes_dir_path, None)?;
-    for scheme in scheme_vec {
-        println!("{}", scheme);
+    let scheme_files = get_scheme_files(&schemes_dir_path, true)?;
+    for scheme_file in scheme_files {
+        let scheme_container = scheme_file.get_scheme()?;
+        let system = scheme_container.get_scheme_system();
+        let slug = scheme_container.get_scheme_slug();
+
+        println!("{}-{}", system, slug);
     }
 
     Ok(())

tests/cli_list_subcommand_tests.rs

@@ -4,7 +4,7 @@ use crate::utils::REPO_NAME;
 use anyhow::Result;
 use std::fs;
 use std::path::Path;
-use utils::setup;
+use utils::{setup, write_to_file};
 
 #[test]
 fn test_cli_list_subcommand_without_setup() -> Result<()> {
@@ -103,7 +103,7 @@ fn test_cli_list_subcommand_with_custom() -> Result<()> {
     let (_, data_path, command_vec, cleanup) =
         setup("test_cli_list_subcommand_with_custom", "list")?;
     let scheme_system = "base16";
-    let scheme_name_one = "tinted-theming";
+    let scheme_name_one = "tinty-generated";
     let scheme_name_two = "tinty";
     let expected_output = format!(
         "{}-{}\n{}-{}",
@@ -112,13 +112,35 @@ fn test_cli_list_subcommand_with_custom() -> Result<()> {
     let custom_scheme_path = data_path.join("custom-schemes");
 
     fs::create_dir_all(custom_scheme_path.join(scheme_system))?;
-    fs::write(
-        custom_scheme_path.join(format!("{}/{}.yaml", scheme_system, scheme_name_one)),
-        "",
+    fs::copy(
+        "./tests/fixtures/schemes/tinty-generated.yaml",
+        custom_scheme_path.join("base16-tinty-generated.yaml"),
     )?;
-    fs::write(
+    write_to_file(
         custom_scheme_path.join(format!("{}/{}.yaml", scheme_system, scheme_name_two)),
-        "",
+        r#"
+system: base16
+name: Tinty
+slug: tinty
+author: Tinty
+variant: dark
+palette:
+  base00: '#282628'
+  base01: '#403e3f'
+  base02: '#595757'
+  base03: '#71706e'
+  base04: '#8a8986'
+  base05: '#a2a29d'
+  base06: '#bbbbb5'
+  base07: '#d4d4cd'
+  base08: '#bf2546'
+  base09: '#f69622'
+  base0A: '#f99923'
+  base0B: '#19953f'
+  base0C: '#40dab9'
+  base0D: '#0666dc'
+  base0E: '#8554ac'
+  base0F: '#ac7424'"#,
     )?;
 
     let mut command_vec = command_vec.clone();