ani-cli

@@ -11,7 +11,6 @@ ANIWRAPPER_ICON_PATH="$CFG_DIR/icons/icon-64.png"
 MAISAN_ICON_PATH="$CFG_DIR/icons/MYsan.png"
 DPI=96
 VERBOSE=0
-SILENT=0
 
 player_fn="mpv"
 playable="\.mp4|\.mkv|\.ts|\.mp3|\.webm"
@@ -37,17 +36,17 @@ help_text() {
 }
 
 die() {
-	((SILENT != 1)) && printf "$c_red%s$c_reset\n" "$*" >&2
+	printf "$c_red%s$c_reset\n" "$*" >&2
 	exit 1
 }
 
 err() {
-	((SILENT != 1)) && printf "$c_red%s$c_reset\n" "$*" >&2
+	printf "$c_red%s$c_reset\n" "$*" >&2
 }
 
-# prints passed in args to stdout if $VERBOSE is set to 1
 lg() {
-	((VERBOSE == 1)) && printf "%s\n" "$*" >&2
+	# prints passed in args to stdout if $VERBOSE is set to 1
+	[ "$VERBOSE" -eq 1 ] && printf "%s\n" "$*" >&2
 }
 
 check_input() {
@@ -679,7 +678,7 @@ open_episode() {
 		if command -v "notify-send" > /dev/null; then
 			notify-send -i "$ANIWRAPPER_ICON_PATH" "Playing $anime_id - Episode $episode"
 		else
-			((SILENT != 1)) && printf "${c_green}\nVideo playing"
+			printf "${c_green}\nVideo playing"
 		fi
 	else
 		lg "Downloading episode $episode ..."
@@ -696,9 +695,9 @@ open_episode() {
 				fi
 			else
 				if aria2c --referer="$dpage_link" "$video_url" --dir="$dl_dir" -o "$episode.mp4" --download-result=hide; then
-					((SILENT != 1)) && printf "${c_green}Downloaded complete for %s - Episode: %s${c_reset}\n" "${anime_id//-/ }" "$episode"
+					printf "${c_green}Downloaded complete for %s - Episode: %s${c_reset}\n" "${anime_id//-/ }" "$episode"
 				else
-					((SILENT != 1)) && printf "${c_red}Download failed for %s - Episode: %s, please retry or check your internet connection${c_reset}\n" "${anime_id//-/ }" "$episode"
+					printf "${c_red}Download failed for %s - Episode: %s, please retry or check your internet connection${c_reset}\n" "${anime_id//-/ }" "$episode"
 				fi
 			fi
 		}
@@ -744,7 +743,7 @@ parse_args() {
 	is_download=0
 	download_dir="."
 	half_ep=0
-	while getopts 'hd:Hsvq:cf:t:T:CQ:D:S' OPT; do
+	while getopts 'hd:Hsvq:cf:t:T:CQ:D:' OPT; do
 		case "$OPT" in
 			h)
 				help_text
@@ -833,9 +832,6 @@ parse_args() {
 			D)
 				DPI="$OPTARG"
 				;;
-			S)
-				SILENT=1
-				;;
 			*)
 				printf "%s\n" "Invalid option"
 				exit 1
@@ -931,8 +927,8 @@ main() {
 		exit 0
 	fi
 
-	if ((SILENT != 1)); then
 	episode=${ep_choice_end:-$ep_choice_start}
+
 	choice=''
 	while :; do
 		printf "\n${c_green}Currently playing %s episode ${c_cyan}%d/%d\n" "$selection_id" $episode $last_ep_number
@@ -991,7 +987,6 @@ main() {
 		esac
 		open_episode "$selection_id" "$episode" "$download_dir"
 	done
-	fi
 }
 
 dep_ch "$player_fn" "curl" "sed" "grep" "sqlite3" "rofi" "git" "aria2c"

aniwrapper

@@ -20,7 +20,6 @@ IS_DOWNLOAD=0
 IS_PLAY_FROM_FILE=0
 IS_ROFI=1
 VERBOSE=0
-SILENT=0
 
 quit="6. Quit"
 options="1. Stream|2. Download|3. Continue|4. Play from File|5. Sync History|$quit"
@@ -53,7 +52,7 @@ Options:
 }
 
 lg() {
-	if ((VERBOSE == 1)); then
+	if [[ "$VERBOSE" -eq 1 ]]; then
 		printf "%s\n" "$*"
 	fi
 }
@@ -69,33 +68,22 @@ quit() {
 }
 
 run() {
-	if ((IS_PLAY_FROM_FILE == 0 && GET_QUALITY == 1)); then
+	if [[ "$IS_PLAY_FROM_FILE" -eq 0 ]] && [[ "$GET_QUALITY" -eq 1 ]]; then
 		get_quality
 	fi
-
+	if [[ "$IS_CUSTOM_THEME" -eq 1 ]] && [[ "$VERBOSE" -eq 0 ]]; then
-	if ((SILENT == 1)); then
+		"$CMD" -D"$DPI" -q "$QUALITY" -T "$CFG_FILE" "$@"
-		if ((IS_CUSTOM_THEME == 0)); then
+	elif [[ "$IS_CUSTOM_THEME" -eq 1 ]] && [[ "$VERBOSE" -eq 1 ]]; then
-			"$CMD" -D"$DPI" -Sq "$QUALITY" -t "$theme" "$@"
-		else
-			"$CMD" -D"$DPI" -Sq "$QUALITY" -T "$CFG_FILE" "$@"
-		fi
-	elif ((VERBOSE == 1)); then
-		if ((IS_CUSTOM_THEME == 0)); then
-			"$CMD" -D"$DPI" -vq "$QUALITY" -t "$theme" "$@"
-		else
 		"$CMD" -D"$DPI" -vq "$QUALITY" -T "$CFG_FILE" "$@"
-		fi
+	elif [[ "$VERBOSE" -eq 0 ]]; then
-	else
-		if ((IS_CUSTOM_THEME == 0)); then
 		"$CMD" -D"$DPI" -q "$QUALITY" -t "$theme" "$@"
 	else
-			"$CMD" -D"$DPI" -q "$QUALITY" -T "$CFG_FILE" "$@"
+		"$CMD" -D"$DPI" -vq "$QUALITY" -t "$theme" "$@"
-		fi
 	fi
 }
 
 get_quality() {
-	if ((IS_ROFI == 1)); then
+	if [ "$IS_ROFI" -eq 1 ]; then
 		selection=$(rofi -dpi "$DPI" -dmenu -config "$CFG_FILE" \
 			-l 5 -selected-row 0 \
 			-theme-str 'listview {columns: 1;}' -p "Choose video quality:" \
@@ -117,7 +105,7 @@ generate_span() {
 }
 
 parse_args() {
-	while getopts 'vhqcdf:-:t:T:CQ:D:S' OPT; do
+	while getopts 'vhqcdf:-:t:T:CQ:D:' OPT; do
 		case "$OPT" in
 			h)
 				help_text
@@ -198,9 +186,6 @@ parse_args() {
 			D)
 				DPI="$OPTARG"
 				;;
-			S)
-				SILENT=1
-				;;
 			*)
 				help_text
 				exit 1
@@ -212,13 +197,10 @@ parse_args() {
 
 check_flags() {
 	# Check if command-line flag is set
-	if ((VERBOSE == 1 && SILENT == 1)); then
+	if [[ "$IS_ROFI" -eq 0 ]] && [[ "$IS_DOWNLOAD" -eq 0 ]]; then
-		seppuku "verbose and silent options cannot be used together"
-	fi
-	if ((IS_ROFI == 0 && IS_DOWNLOAD == 0)); then
 		run -c
 		exit $?
-	elif ((IS_ROFI == 0 && IS_DOWNLOAD == 1)); then
+	elif [[ "$IS_ROFI" -eq 0 ]] && [[ "$IS_DOWNLOAD" -eq 1 ]]; then
 		printf "%s" "Enter download dir: "
 		read -r dl_dir
 		lg "Download dir: $dl_dir"
@@ -227,10 +209,10 @@ check_flags() {
 		fi
 		run "-cd $dl_dir"
 		exit $?
-	elif ((IS_ROFI == 1 && IS_PLAY_FROM_FILE == 1 && IS_CUSTOM_THEME == 1)); then
+	elif [[ "$IS_ROFI" -eq 1 ]] && [[ "$IS_PLAY_FROM_FILE" -eq 1 ]] && [[ "$IS_CUSTOM_THEME" -eq 1 ]]; then
 		run "-f$play_path" -T "$CFG_FILE"
 		exit $?
-	elif ((IS_ROFI == 1 && IS_PLAY_FROM_FILE == 1 && IS_CUSTOM_THEME == 0)); then
+	elif [[ "$IS_ROFI" -eq 1 ]] && [[ "$IS_PLAY_FROM_FILE" -eq 1 ]] && [[ "$IS_CUSTOM_THEME" -eq 0 ]]; then
 		run "-f$play_path" -t "$theme"
 		exit $?
 	fi