improve customizability

Author: hyperupcall

Cargo.lock

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

Cargo.toml

@@ -0,0 +1,2 @@
+hard_tabs = true
+tab_spaces = 3

bake

@@ -0,0 +1,24 @@
+use std::str;
+
+use clap::{Parser, Subcommand};
+
+#[derive(Parser, Debug)]
+#[command(author, version, about, long_about = None)]
+pub struct Args {
+	#[command(subcommand)]
+	pub action: Action,
+
+	/// Whether or not to show the GUI
+	#[arg(long, default_value_t = false)]
+	pub gui: bool,
+}
+
+#[derive(Subcommand, Debug)]
+pub enum Action {
+	Launch { category: String },
+	Set { category: String, choice: String },
+	Get { category: String },
+	Install { category: String, choice: String },
+	Uninstall { category: String, choice: String },
+	Test { category: String, choice: String },
+}

rustfmt.toml

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+_die() {
+	printf '%s\n' 'Error: ' "$1" 2>&1
+}
+
+_main() {
+	local file="$1"
+	local action="$2"
+	shift || _die 'Failed shift'
+	shift || _die 'Failed shift'
+
+	# shellcheck disable=SC1090
+	source "$file"
+	if [ "$action" = 'install' ]; then
+		install "$@"
+	elif [ "$action" = 'uninstall' ]; then
+		uninstall "$@"
+	elif [ "$action" = 'test' ]; then
+		test "$@"
+	elif [ "$action" = 'launch' ]; then
+		launch "$@"
+	fi
+}
+
+_main "$@"

src/cli.rs

@@ -1,124 +1,74 @@
-use std::process::Command;
-use std::str;
+use clap::Parser;
+use cli::{Action, Args};
 
-use clap::{Parser,Subcommand};
+mod cli;
 
-#[derive(Parser, Debug)]
-#[command(author, version, about, long_about = None)]
-struct Args {
-	#[command(subcommand)]
-	action: Action,
-
-	/// Whether or not to show the GUI
-	#[arg(long, default_value_t = false)]
-	gui: bool
-}
-
-#[derive(Subcommand, Debug)]
-enum Action {
-	Launch {
-		category: String,
-	},
-	Set {
-		category: String,
-		value: String
-	},
-	Get {
-		category: String
-	}
-}
+mod util;
 
 // EXECUTION PROVIDER
 // rust "inline exec"
 // shell script combo (putting together every application of a category in a single shell script to save space / times)
 // shell script
 // desktop file
 
-fn run(args: &[&str]) {
-	let output = Command::new("starship").args(["init", "bash", "--print-full-init"]).output().expect("Failed to execute child process");
-	if output.status.success() {
-		println!("{}", str::from_utf8(&output.stdout.clone()).unwrap())
-	} {
-		println!("{}", str::from_utf8(&output.stderr.clone()).unwrap());
-
-	}
-}
-
 fn main() {
 	let cli = Args::parse();
+	let mut data = util::get_data();
 
 	match cli.action {
 		Action::Launch { category } => {
 			match category.as_str() {
-				"application-launcher" => {
-
-				},
-				"file-manager" => {
-
-				},
-				"image-viewer" => {
-
-				},
-				"image-editor" => {
-
-				},
+				"application-launcher" => {}
+				"file-manager" => {}
+				"image-viewer" => {}
+				"image-editor" => {}
 				"shell-prompt-bash" => {
-					let args = ["starship", "init", "bash", "--print-full-init"];
-					run(args.as_slice());
-				},
+					let choice = data
+						.choices
+						.shell_prompt_bash
+						.unwrap_or(String::from("starship"));
+					util::launch("shell-prompt-bash", choice);
+				}
 				"shell-prompt-zsh" => {
-					let args = ["starship", "init", "zsh", "--print-full-init"];
-					run(args.as_slice());
-				},
+					let _args = vec!["starship", "init", "zsh", "--print-full-init"];
+				}
 				"menu-bar-text" => {
-					let args = ["i3blocks"];
-					run(args.as_slice());
-				},
+					let _args = vec!["i3blocks"];
+				}
 				"terminal-emulator" => {
-					let args = ["kitty"];
-					run(args.as_slice());
-				},
+					let _args = vec!["kitty"];
+				}
 				// brightness
-				"brightness-increase" => {
-
-				},
-				"brightness-decrease" => {
-
-				},
-				"brightness-reset" => {
-
-				},
+				"brightness-increase" => {}
+				"brightness-decrease" => {}
+				"brightness-reset" => {}
 				// song
-				"song-previous" => {
-
-				},
-				"song-pause" => {
-
-				},
-				"song-next" => {
-
-				},
+				"song-previous" => {}
+				"song-pause" => {}
+				"song-next" => {}
 				// volume
-				"volume-lower" => {
-
-				},
-				"volume-raise" => {
-
-				},
-				"volume-mute" => {
-
-				},
-				"window-manager" => {
-
-				}
-				&_ => todo!()
+				"volume-lower" => {}
+				"volume-raise" => {}
+				"volume-mute" => {}
+				"window-manager" => {}
+				&_ => todo!(),
 			}
-		},
-		Action::Set { category, value } => {
-
-		},
-		Action::Get { category } => {
+		}
+		Action::Set { category, choice } => {
+			match category.as_str() {
+				"shell-prompt-bash" => data.choices.shell_prompt_bash = Some(String::from(choice)),
+				_ => {}
+			};
 
+			util::save_data(&data);
+		}
+		Action::Get { category: _ } => {}
+		Action::Install { category, choice } => {
+			util::run(category.as_str(), choice.as_str(), "install")
+		}
+		Action::Uninstall { category, choice } => {
+			util::run(category.as_str(), choice.as_str(), "uninstall")
 		}
+		Action::Test { category, choice } => util::run(category.as_str(), choice.as_str(), "test"),
 	}
 }