README.md

@@ -135,8 +135,8 @@ The above output was produced by searching: `isekai -`
 ## aniwrapper
 
 ```
-aniwrapper [-cdhpqSv] [-t <theme> or -T <config_path>] <query>
-aniwrapper [-cpqSv] [-t <theme> or -T <config_path>] -f <path_to_directory>
+aniwrapper [-cdhpqvS] [-t <theme> or -T <config_path>] <query>
+aniwrapper [-cvS] [-t <theme> or -T <config_path>] -f <path_to_directory>
 aniwrapper -Q <query>
 aniwrapper -C
 

aniwrapper

@@ -38,24 +38,23 @@ help_text() {
 		printf "%s\n" "$line"
 	done <<< "
 Usage:
-	aniwrapper [-dhpqSv] [-t <theme> | -T <config_path>] [<query>]
-	aniwrapper -f <directory_path> [-t <theme> | -T <config_path>] [-pSv] [<query>]\
-	aniwrapper -c [-dhpqSv] [<query>]
-	aniwrapper -Q <query>
-	aniwrapper -C
+    aniwrapper [-cdhpqvS] [-t <theme> or -T <config_path>]
+    aniwrapper [-cvS] [-t <theme> or -T <config_path>] -f <path_to_directory>
+    aniwrapper -Q <query>
+    aniwrapper -C
 Options:
-	-c  enable command-line mode (rofi disabled)
-	-C  connect to history database
-	-d  download episode in command-line mode
-	-f  <path_to_directory> (no trailing slash) specify starting directory for play for file mode
-	-h  show this help text
-	-p  enable player selection menu
-	-q  enable quality selection
-	-Q  <query> query the history database
-	-v  verbose output
-	-S  silent mode (suppress output to stdout) [cannot be used with -v]
-	-t  <aniwrapper (default)|dracula|doomone|fancy|flamingo|material|onedark> change rofi theme
-	-T  <config_path> specify custom rofi theme
+     -c  enable command-line mode (rofi disabled)
+     -C  connect to history database
+     -d  download episode in command-line mode
+     -f  <path_to_directory> (no trailing slash) specify starting directory for play for file mode
+     -h  show this help text
+	 -p  enable player selection menu
+     -q  enable quality selection
+     -Q  <query> query the history database
+	 -v  verbose output
+     -S  silent mode (suppress output to stdout) [cannot be used with -v]
+     -t  <aniwrapper (default)|dracula|doomone|fancy|flamingo|material|onedark> change rofi theme
+     -T  <config_path> specify custom rofi theme
 	"
 }
 
@@ -229,10 +228,14 @@ parse_args() {
 	done
 }
 
-get_player() {
-	msg1="Choose from the supported players, or supply your own player command (full functionality not guaranteed)"
-	msg2="if using an unsupported player, it must be able to play URLs for streaming from the internet"
-	if ((IS_ROFI == 1)); then
+check_flags() {
+	# Check if command-line flag is set
+	if ((VERBOSE == 1 && SILENT == 1)); then
+		seppuku "verbose and silent options cannot be used together"
+	fi
+	if ((IS_DOWNLOAD == 0 && IS_ALTERNATE_PLAYER == 1)); then
+		msg1="Choose from the supported players, or supply your own player command (full functionality not guaranteed)"
+		msg2="if using an unsupported player, it must be able to play URLs for streaming from the internet"
 		PLAYER_FN=$(
 			awk '{print $NF}' < <(rofi -dmenu -config "$CFG_FILE" -DPI "$DPI" \
 				-l 4 -theme-str 'listview {columns: 1;} window {width: 40%;}' \
@@ -240,32 +243,10 @@ get_player() {
 				-mesg "$(printf "%s\n%s\n" "$(generate_span "$msg1")" "$(generate_span "$msg2")")" \
 				-a 0 -sep '|' <<< "$SUPPORTED_PLAYERS")
 		)
-	else
-		printf "%s\n%s\n" "$msg1" "$msg2"
-		printf "%s\n" "SUPPORTED PLAYERS:"
-		# while read -r player; do
-		# 	printf "%s\n" "$player"
-		# done <<< "$(printf "%s\n" "$SUPPORTED_PLAYERS" | sed 's/|/\n/g')"
-		# bash version
-		while IFS='|' read -ra players; do
-			printf "%s\n" "${players[@]}"
-		done <<< "$SUPPORTED_PLAYERS"
-		printf "%s" "Enter player: "
-		read -r PLAYER_FN
-	fi
-	[ -z "$PLAYER_FN" ] && PLAYER_FN=mpv
-	if ! command -v "$PLAYER_FN" > /dev/null; then
-		seppuku "ERROR: $PLAYER_FN does not exist"
-	fi
-}
-
-check_flags() {
-	# Check if command-line flag is set
-	if ((VERBOSE == 1 && SILENT == 1)); then
-		seppuku "verbose and silent options cannot be used together"
-	fi
-	if ((IS_DOWNLOAD == 0 && IS_ALTERNATE_PLAYER == 1)); then
-		get_player
+		[ -z "$PLAYER_FN" ] && PLAYER_FN=mpv
+		if ! command -v "$PLAYER_FN" > /dev/null; then
+			seppuku "ERROR: $PLAYER_FN does not exist"
+		fi
 		lg "SELECTED PLAYER FN -> $PLAYER_FN"
 	fi
 	if ((IS_ROFI == 0 && IS_DOWNLOAD == 0)); then

docs/man/aniwrapper.1

@@ -8,17 +8,13 @@ aniwrapper - A rofi wrapper around ani-cli: a command-line tool to
 browser, download, and stream anime
 .SH SYNOPSIS
 .PP
-\f[B]aniwrapper\f[R] [-dhpqSv] [-t \f[I]theme\f[R] | -T
+\f[B]aniwrapper\f[R] [-cdhpqvS] [-t \f[I]theme\f[R] | -T
 \f[I]config_path\f[R]] [\f[I]query\f[R]]
 .PD 0
 .P
 .PD
-\f[B]aniwrapper\f[R] -f \f[I]directory_path\f[R] [-t \f[I]theme\f[R] |
--T \f[I]config_path\f[R]] [-pSv] [\f[I]query\f[R]]
-.PD 0
-.P
-.PD
-\f[B]aniwrapper\f[R] -c [-dhpqSv] [\f[I]query\f[R]]
+\f[B]aniwrapper\f[R] [-cvS] [-t \f[I]theme\f[R] | -T
+\f[I]config_path\f[R]] -f \f[I]path_to_directory\f[R]
 .PD 0
 .P
 .PD
@@ -89,30 +85,28 @@ Verbose output
 Launch main menu with default options
 .TP
 \f[B]aniwrapper konosuba\f[R]
-Run in \f[I]stream\f[R] mode with a \f[I]search query\f[R] =
-\[lq]konosuba\[rq]
+Run in stream mode with a search query: \[lq]konosuba\[rq]
 .TP
 \f[B]aniwrapper -qd naruto\f[R]
-Run in \f[I]download\f[R] mode with \f[I]quality selection enabled\f[R]
-and a \f[I]search query\f[R] = \[lq]naruto\[rq]
+Run in download mode with quality selection enabled and a search query:
+\[lq]naruto\[rq]
 .TP
 \f[B]aniwrapper -vqt doomone\f[R]
-Run with \f[I]quality selection enabled\f[R] and the \f[I]doomone\f[R]
-theme
+Run with quality selection menu and \f[I]doomone\f[R] theme
 .TP
-\f[B]aniwrapper -cqd\f[R]
-Run in \f[I]command-line\f[R] \f[I]download\f[R] mode with \f[I]quality
-selection enabled\f[R] (\f[B]rofi\f[R] disabled)
+\f[B]aniwrapper -cd\f[R]
+Enable downloading an anime in command-line mode (\f[B]rofi\f[R]
+disabled)
 .TP
 \f[B]aniwrapper -Q \[lq]SELECT * FROM watch_history ORDER BY watch_date DESC LIMIT 10;\[rq]\f[R]
 Query history database for your 10 most recently watched anime
 .TP
-\f[B]aniwrapper -f /media/videos -t dracula\f[R]
-Run in \f[I]Play from File\f[R] mode, using the \f[I]dracula\f[R] theme,
-and with the \f[I]search\f[R] starting from \f[I]/media/videos\f[R]
+\f[B]aniwrapper -f /media/videos\f[R]
+Run in \[lq]Play from File\[rq] mode starting the search from the
+\f[I]/media/videos\f[R] directory
 .TP
 \f[B]aniwrapper -S\f[R]
-Run in \f[I]silent\f[R] mode (suppress all output to stdout and disable
+Run in quiet mode (suppress all output to stdout and disable
 notifications)
 .SH SEE ALSO
 .PP

docs/man/aniwrapper.1.md

@@ -12,9 +12,8 @@ aniwrapper - A rofi wrapper around ani-cli: a command-line tool to browser, down
 
 # SYNOPSIS
 
-**aniwrapper** [-dhpqSv] [-t _theme_ | -T *config_path*] [*query*]\
-**aniwrapper** -f _directory_path_ [-t _theme_ | -T *config_path*] [-pSv] [*query*]\
-**aniwrapper** -c [-dhpqSv] [*query*]\
+**aniwrapper** [-cdhpqvS] [-t _theme_ | -T *config_path*] [*query*]\
+**aniwrapper** [-cvS] [-t *theme* | -T *config_path*] -f _path_to_directory_\
 **aniwrapper** -Q _query_\
 **aniwrapper** -C\
 
@@ -74,26 +73,26 @@ Defaults:
 : Launch main menu with default options
 
 **aniwrapper konosuba**
-: Run in _stream_ mode with a _search query_ = "konosuba"
+: Run in stream mode with a search query: "konosuba"
 
 **aniwrapper -qd naruto**
-: Run in _download_ mode with _quality selection enabled_ and a _search query_ =
+: Run in download mode with quality selection enabled and a search query:
 "naruto"
 
 **aniwrapper -vqt doomone**
-: Run with _quality selection enabled_ and the _doomone_ theme
+: Run with quality selection menu and _doomone_ theme
 
-**aniwrapper -cqd**
-: Run in _command-line_ _download_ mode with _quality selection enabled_ (**rofi** disabled)
+**aniwrapper -cd**
+: Enable downloading an anime in command-line mode (**rofi** disabled)
 
 **aniwrapper -Q "SELECT \* FROM watch_history ORDER BY watch_date DESC LIMIT 10;"**
 : Query history database for your 10 most recently watched anime
 
-**aniwrapper -f /media/videos -t dracula**
-: Run in _Play from File_ mode, using the _dracula_ theme, and with the _search_ starting from _/media/videos_
+**aniwrapper -f /media/videos**
+: Run in "Play from File" mode starting the search from the _/media/videos_ directory
 
 **aniwrapper -S**
-: Run in _silent_ mode (suppress all output to stdout and disable notifications)
+: Run in quiet mode (suppress all output to stdout and disable notifications)
 
 # SEE ALSO