refactor: Move subcommands from single file to subcommands dir

Author: hyperupcall

pkg/src/do.sh renamed to pkg/commands/choose-launch.sh

@@ -1,58 +1,6 @@
 # shellcheck shell=bash
 
-do_set() {
-	local category="$1"
-	local program="$2"
-	local gui="$3"
-
-	# Get category
-	if ! helper_get_category "$category" "$gui"; then
-		log.die "$gui" "Could not get category"
-	fi
-	category="$REPLY"
-
-	# Get program
-	if ! helper_get_program "$category" "$program" "$gui"; then
-		log.die "$gui" "Could not get program"
-	fi
-	program="$REPLY"
-
-	# -------------------------- set ------------------------- #
-	# Source category pre
-	if [ -f "$db_dir/$category/set-pre.sh" ]; then
-		if ! sh -e "$db_dir/$category/set-pre.sh" "$db_dir/$category" "$program"; then
-			return 1
-		fi
-	fi
-
-	# Source program pre
-	if [ -f "$db_dir/$category/$program/set-pre.sh" ]; then
-		if ! sh -e "$db_dir/$category/$program/set-pre.sh" "$db_dir/$category" "$program"; then
-			return 1
-		fi
-	fi
-
-	# Actually set
-	printf "%s" "$program" >| "$db_dir/$category/_.current"
-
-	# Source program post
-	if [ -f "$db_dir/$category/$program/set-post.sh" ]; then
-		if ! sh -e "$db_dir/$category/$program/set-post.sh" "$db_dir/$category" "$program"; then
-			return 1
-		fi
-	fi
-
-	# Source category post
-	if [ -f "$db_dir/$category/set-post.sh" ]; then
-		if ! sh -e "$db_dir/$category/set-post.sh" "$db_dir/$category" "$program"; then
-			return 1
-		fi
-	fi
-
-	log.info "Category '$category' defaults to '$program'"
-}
-
-do_launch() {
+choose-launch() {
 	local category="$1"
 	local gui="$2"
 
@@ -113,15 +61,3 @@ do_launch() {
 		fi
 	fi
 }
-
-do_print() {
-	local category="$1"
-
-	program="$(<"$db_dir/$category/_.current")"
-
-	# ensure variable (we already use 'ensure_has_dot_current' in
-	# helper_get_category_filter; this is another safeguard)
-	if [ -z "$program" ]; then
-		log.die "$gui" "Program for '$category' is not set. Please set with 'choose set'"
-	fi
-}

pkg/commands/choose-print.sh

@@ -0,0 +1,13 @@
+# shellcheck shell=bash
+
+choose-print() {
+	local category="$1"
+
+	program="$(<"$db_dir/$category/_.current")"
+
+	# ensure variable (we already use 'ensure_has_dot_current' in
+	# helper_get_category_filter; this is another safeguard)
+	if [ -z "$program" ]; then
+		log.die "$gui" "Program for '$category' is not set. Please set with 'choose set'"
+	fi
+}

pkg/commands/choose-set.sh

@@ -0,0 +1,54 @@
+# shellcheck shell=bash
+
+choose-set() {
+	local category="$1"
+	local program="$2"
+	local gui="$3"
+
+	# Get category
+	if ! helper_get_category "$category" "$gui"; then
+		log.die "$gui" "Could not get category"
+	fi
+	category="$REPLY"
+
+	# Get program
+	if ! helper_get_program "$category" "$program" "$gui"; then
+		log.die "$gui" "Could not get program"
+	fi
+	program="$REPLY"
+
+	# -------------------------- set ------------------------- #
+	# Source category pre
+	if [ -f "$db_dir/$category/set-pre.sh" ]; then
+		if ! sh -e "$db_dir/$category/set-pre.sh" "$db_dir/$category" "$program"; then
+			return 1
+		fi
+	fi
+
+	# Source program pre
+	if [ -f "$db_dir/$category/$program/set-pre.sh" ]; then
+		if ! sh -e "$db_dir/$category/$program/set-pre.sh" "$db_dir/$category" "$program"; then
+			return 1
+		fi
+	fi
+
+	# Actually set
+	printf "%s" "$program" >| "$db_dir/$category/_.current"
+
+	# Source program post
+	if [ -f "$db_dir/$category/$program/set-post.sh" ]; then
+		if ! sh -e "$db_dir/$category/$program/set-post.sh" "$db_dir/$category" "$program"; then
+			return 1
+		fi
+	fi
+
+	# Source category post
+	if [ -f "$db_dir/$category/set-post.sh" ]; then
+		if ! sh -e "$db_dir/$category/set-post.sh" "$db_dir/$category" "$program"; then
+			return 1
+		fi
+	fi
+
+	log.info "Category '$category' defaults to '$program'"
+}
+

pkg/src/bin/choose.sh

@@ -30,17 +30,20 @@ main.choose() {
 		local category="${argsCommands[1]}"
 		local program="${argsCommands[2]}"
 
-		do_set "$category" "$program" "$gui"
+		source "$BASALT_PACKAGE_DIR/pkg/commands/choose-set.sh"
+		choose-set "$category" "$program" "$gui"
 		;;
 	launch)
 		local category="${argsCommands[1]}"
 
-		do_launch "$category" "$gui"
+		source "$BASALT_PACKAGE_DIR/pkg/commands/choose-launch.sh"
+		choose-launch "$category" "$gui"
 		;;
 	print)
 		local category="${argsCommands[1]}"
 
-		do_print "$category" "$gui"
+		source "$BASALT_PACKAGE_DIR/pkg/commands/choose-print.sh"
+		choose-print "$category" "$gui"
 		;;
 	*)
 		log.die "Subcommand '${argsCommands[0]}' not found"