cleanup and add 'list' command

Author: hyperupcall

Cargo.lock

@@ -5,5 +5,6 @@ edition = "2021"
 
 [dependencies]
 clap = { version = "4.0.15", features = ["derive"] }
+dirs = "4.0.0"
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = "1.0.91"

Cargo.toml

@@ -18,6 +18,7 @@ pub enum Action {
 	Launch { category: String },
 	Set { category: String, choice: String },
 	Get { category: String },
+	List { category: Option<String> },
 	Install { category: String, choice: String },
 	Uninstall { category: String, choice: String },
 	Test { category: String, choice: String },

src/cli.rs

@@ -1,3 +1,5 @@
+use std::{fs, path::PathBuf};
+
 use clap::Parser;
 use cli::{Action, Args};
 
@@ -27,7 +29,7 @@ fn main() {
 						.choices
 						.shell_prompt_bash
 						.unwrap_or(String::from("starship"));
-					util::launch("shell-prompt-bash", choice);
+					util::run("shell-prompt-bash", choice.as_str(), "launch");
 				}
 				"shell-prompt-zsh" => {
 					let _args = vec!["starship", "init", "zsh", "--print-full-init"];
@@ -63,6 +65,27 @@ fn main() {
 			util::save_data(&data);
 		}
 		Action::Get { category: _ } => {}
+		Action::List { category } => {
+			let list = |dir: PathBuf| {
+				for entry in fs::read_dir(&dir)
+					.expect(format!("Directory does not exist: {}", dir.to_str().unwrap()).as_str())
+				{
+					let path = entry.unwrap().path();
+					let basename = path.file_name().unwrap();
+
+					println!("{}", basename.to_str().unwrap());
+				}
+			};
+
+			let choose_dir = util::get_choose_dir();
+			if let Some(category) = category {
+				let dir = choose_dir.join("choices").join(category);
+				list(dir);
+			} else {
+				let dir = choose_dir.join("choices");
+				list(dir);
+			}
+		}
 		Action::Install { category, choice } => {
 			util::run(category.as_str(), choice.as_str(), "install")
 		}

src/launcher.sh

@@ -4,8 +4,6 @@ use std::{env, fs, path::PathBuf, process::Command};
 
 use serde::{Deserialize, Serialize};
 
-pub struct Config {}
-
 #[derive(Serialize, Deserialize)]
 pub struct Choices {
 	pub shell_prompt_bash: Option<String>,
@@ -16,32 +14,15 @@ pub struct Data {
 	pub choices: Choices,
 }
 
-pub fn launch(category: &str, choice: String) {
-	let entrypoint =
-		"/storage/ur/storage_home/Docs/Programming/Repositories/default/choose/src/launcher.sh";
-
-	let choice_file = PathBuf::from(format!("{}", env::var("HOME").unwrap()))
-		.join(".dotfiles/os/*nix/user/.config/choose/choices")
-		.join(category)
-		.join(format!("{}.sh", choice.as_str()));
-
-	Command::new(entrypoint)
-		.arg(choice_file)
-		.arg("launch")
-		.spawn()
-		.unwrap();
-}
-
 pub fn run(category: &str, choice: &str, action: &str) {
-	let entrypoint =
-		"/storage/ur/storage_home/Docs/Programming/Repositories/default/choose/src/launcher.sh";
+	let choose_dir = get_choose_dir();
 
-	let choice_file = PathBuf::from(format!("{}", env::var("HOME").unwrap()))
-		.join(".dotfiles/os/*nix/user/.config/choose/choices")
+	let choice_file = choose_dir
+		.join("choices")
 		.join(category)
 		.join(format!("{}.sh", choice));
 
-	let exit_status = Command::new(entrypoint)
+	let exit_status = Command::new(choose_dir.join("launcher.sh"))
 		.arg(choice_file)
 		.arg(action)
 		.spawn()
@@ -54,17 +35,32 @@ pub fn run(category: &str, choice: &str, action: &str) {
 }
 
 pub fn get_data() -> Data {
-	let path = PathBuf::from(format!("{}", env::var("HOME").unwrap()))
-		.join(".dotfiles/os/*nix/user/.config/choose/data.json");
+	let path = get_choose_dir().join("data.json");
+
 	let content = fs::read_to_string(path).unwrap();
 	let data: Data = serde_json::from_str(content.as_str()).unwrap();
 	data
 }
 
 pub fn save_data(data: &Data) {
-	let path = PathBuf::from(format!("{}", env::var("HOME").unwrap()))
-		.join(".dotfiles/os/*nix/user/.config/choose/data.json");
+	let path = get_choose_dir().join("data.json");
 
 	let deserialized = serde_json::to_string(data).unwrap();
 	fs::write(path, deserialized).unwrap();
 }
+
+pub fn get_choose_dir() -> PathBuf {
+	let dotfiles_dir = match env::var("XDG_CONFIG_HOME") {
+		Ok(val) => {
+			let p = PathBuf::from(val);
+			if p.is_absolute() {
+				p
+			} else {
+				PathBuf::from(dirs::home_dir().unwrap()).join(".config")
+			}
+		}
+		Err(..) => PathBuf::from(dirs::home_dir().unwrap()).join(".config"),
+	};
+
+	dotfiles_dir.join("choose")
+}