salt/bin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ptgdp: Properly handle invoking -R with a file

Browse Source
This commit is contained in:
Salt
2019-08-18 01:31:26 -05:00
parent d7b8c7e392
commit a41600823a
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ptgdp
View File

@@ -278,6 +278,8 @@ rofimenu() {
error "Could not open directory \"$_optrofi\"" 2 error "Could not open directory \"$_optrofi\"" 2
else else
[ -f "$_optrofi" ] || error "Could not open file \"$_optrofi\"" 2 [ -f "$_optrofi" ] || error "Could not open file \"$_optrofi\"" 2
rofiplaysong "$_optrofi"
return $?
fi fi
fi fi
files=$(find "$_optrofi" -type f -name \*.gdp) files=$(find "$_optrofi" -type f -name \*.gdp)
@@ -324,10 +326,13 @@ rofiplaysong() {
choice="$(rofi -dmenu -i -p "$prompt" <<< "$songs" 2>/dev/null)" choice="$(rofi -dmenu -i -p "$prompt" <<< "$songs" 2>/dev/null)"
if [ -z "$choice" ]; then if [ -z "$choice" ]; then
# Assume user is looking for another list # Assume user is looking for another list
# Kick him back to the main menu # Kick him back to the main menu, unless he picked a file
rofimenu if ! [ "$_optrofi" = "$1" ]; then
rofimenu
else
error "User aborted at selection" 62
fi
fi fi
log "User picked: $choice"
queuesong "$choice" queuesong "$choice"
[ "$?" = "1" ] && return 62 [ "$?" = "1" ] && return 62
execqueue execqueue