Skip to content

Commit 0d1ead8

Browse files
authored
fix: ctrl-c or esc should escape, not say invalid action (#53)
1 parent ef068a3 commit 0d1ead8

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

yt-x

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ playlist_explorer() {
751751
"Main Menu")
752752
break
753753
;;
754-
Back)
754+
Back|"")
755755
break
756756
;;
757757
Exit)
@@ -1151,7 +1151,7 @@ ${RED}󰈆${RESET} Exit" | launcher "Select Media Action" | sed 's/. //g')"
11511151
yt-dlp "$video_url" -x -f 'bestaudio' --audio-format mp3 --output "$DOWNLOAD_DIRECTORY/audio/individual/%(channel)s/%(title)s.%(ext)s" $PREFERRED_BROWSER
11521152
send_notification "Completed downloading $title"
11531153
;;
1154-
Back)
1154+
Back|"")
11551155
break
11561156
;;
11571157
Shell)
@@ -1237,7 +1237,7 @@ playlists_explorer() {
12371237
clear
12381238
playlist_title="$(echo "$playlist_title" | sed 's/"/\\"/g')"
12391239
case "$playlist_title" in
1240-
*Back)
1240+
*Back|"")
12411241
break
12421242
;;
12431243
*Exit)
@@ -1267,7 +1267,7 @@ ${CYAN}󰌍${RESET} Back
12671267
${RED}󰈆${RESET} Exit
12681268
" | launcher "Select Action" | sed 's/. //g')"
12691269
[ "$channel_action" = "Exit" ] && byebye
1270-
[ "$channel_action" = "Back" ] && break
1270+
[ "$channel_action" = "Back" ] || [ "$channel_action" = "" ] && break
12711271
uploader_url_base="$(echo "$channel" | jq '.uploader_url' -r)"
12721272

12731273
case "$channel_action" in
@@ -1432,7 +1432,7 @@ ${RED}󰈆${RESET} Exit" | launcher "Select Action" | sed 's/.* //g')"
14321432
! [ -s "$CUSTOM_PLAYLISTS" ] && echo "You dont have any custom playlists create them here <$CUSTOM_PLAYLISTS>" && sleep "$NOTIFICATION_DURATION" && main
14331433
while true; do
14341434
playlist_title=$(printf "%s\nBack" "$(jq -r '.|reverse|.[].name' "$CUSTOM_PLAYLISTS")" | launcher "Select Custom Playlist To Play")
1435-
[ "$playlist_title" = "Back" ] && break
1435+
[ "$playlist_title" = "Back" ] || [ "$playlist_title" = "" ] && break
14361436
url=$(jq -r ". | map(select(.name == \"$playlist_title\" )) | .[0].playlistWatchUrl" "$CUSTOM_PLAYLISTS")
14371437
urlForAll=$(jq -r ". | map(select(.name == \"$playlist_title\" )) | .[0].playlistUrl" "$CUSTOM_PLAYLISTS")
14381438
search_results=$(run_yt_dlp "$url")
@@ -1508,7 +1508,7 @@ ${RED}󰈆${RESET} Exit
15081508
channel_name=$(printf "%s\nBack\nExit" "$channels" | launcher_with_preview "Select Channel" "$PREVIEW_SCRIPT_FOR_CHANNELS_EXPLORER")
15091509
channel_name="$(echo "$channel_name" | sed 's/"/\\"/g;s/ *$//g' | tr -d "\n")"
15101510
[ "$channel_name" = "Exit" ] && byebye
1511-
[ "$channel_name" = "Back" ] && break
1511+
[ "$channel_name" = "Back" ] || [ "$channel_name" = "" ] && break
15121512
channel="$(echo "$channels_data" | jq ".entries|map(select(.channel == \"$channel_name\"))|.[0]")"
15131513
channels_explorer
15141514
done
@@ -1527,7 +1527,7 @@ ${RED}󰈆${RESET} Exit
15271527
while true; do
15281528
! [ -s "$CLI_CACHE_DIR/search_history.txt" ] && echo "No search history or disabed" && sleep "$NOTIFICATION_DURATION" && main
15291529
search_term="$(printf "$(tac "$CLI_CACHE_DIR/search_history.txt")\nBack" | launcher "Search for" | jq -Rr '@uri')"
1530-
[ "$search_term" = "Back" ] && break
1530+
[ "$search_term" = "Back" ] || [ "$search_term" = "" ] && break
15311531
url="https://www.youtube.com/results?search_query=$search_term&sp=EgIQAQ%253D%253D"
15321532
search_results=$(run_yt_dlp "$url")
15331533
playlist_explorer
@@ -1563,7 +1563,7 @@ ${RED}󰈆${RESET} Exit
15631563
! [ -s "$F_CUSTOM_CMDS" ] && send_notification "You dont have any custom cmds create them here <$F_CUSTOM_CMDS>"
15641564
while true; do
15651565
custom_cmd_name=$(printf "%s\nBack" "$(jq -r '.[].name' "$F_CUSTOM_CMDS")" | launcher "Select Custom Data Loader Command To Run")
1566-
[ "$custom_cmd_name" = "Back" ] && break
1566+
[ "$custom_cmd_name" = "Back" ] || [ "$custom_cmd_name" = "" ] && break
15671567
custom_yt_dlp_cmd=$(jq -r ". | map(select(.name == \"$custom_cmd_name\" )) | .[0].cmd" "$F_CUSTOM_CMDS")
15681568
echo Running custom command...
15691569
search_results=$(
@@ -1646,7 +1646,7 @@ ${RED}󰈆${RESET} Exit
16461646
send_notification "Sync cancelled"
16471647
fi
16481648
;;
1649-
Back)
1649+
Back|"")
16501650
break
16511651
;;
16521652
Exit)
@@ -1659,7 +1659,7 @@ ${RED}󰈆${RESET} Exit
16591659
esac
16601660
done
16611661
;;
1662-
Exit)
1662+
Exit|"")
16631663
byebye
16641664
;;
16651665
*)

0 commit comments

Comments
 (0)