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

Fix queueing up files, validate files (loosely) before continuing

Browse Source
This commit is contained in:
Salt
2019-09-27 21:58:44 -05:00
parent 1b32a72a0a
commit 44708588ee
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ptgdp
View File

@@ -125,7 +125,16 @@ cachesong() {
"$1") "$1")
then then
# Sanitize removes all periods, so this is safe # Sanitize removes all periods, so this is safe
_return="$filename".* for file in "$filename".*; do
if [ -f "$file" ]; then
_return="$file"
else
error "Downloaded song \"$_return\" but could not find output file"
log "$ytdllog" 2
_returnstatus="err"
return 1
fi
done
_returnstatus="dl" _returnstatus="dl"
log "Downloaded song to \"$_return\"" 2 log "Downloaded song to \"$_return\"" 2
log "$ytdllog" 2 log "$ytdllog" 2
@@ -202,7 +211,8 @@ backend-enqueue() { # Enqueues a song
mpd) mpd)
file=${1##$_mpdroot/} file=${1##$_mpdroot/}
if ! mpc add "$file" > /dev/null 2>&1; then if ! mpc add "$file" > /dev/null 2>&1; then
error "Could not add file: \"$file\" ($?)" errorval="$?"
error "Could not add file: \"$file\" ($errorval)"
fi fi
return 0 return 0
;; ;;