bin: adjust music playing utilities
This commit is contained in:
parent
ad78e5fb6f
commit
6f5338edcf
|
@ -1,7 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# Select a song in the mpd queue using fzf and mpc
|
# Select a song in the mpd queue using fzf and mpc
|
||||||
local song_position
|
|
||||||
song_position=$(mpc -f "%position%) %artist% - %title%" playlist | \
|
song_position=$(mpc -f "%position%) %artist% - %title%" playlist | \
|
||||||
fzf-tmux --query="$1" --reverse --select-1 --exit-0 | \
|
fzf-tmux --query="$1" --reverse --select-1 --exit-0 | \
|
||||||
sed -n 's/^\([0-9]\+\)).*/\1/p') || return 1
|
sed -n 's/^\([0-9]\+\)).*/\1/p') || return 1
|
||||||
[ -n "$song_position" ] && mpc -q play $song_position
|
test -n "$song_position" && mpc play $song_position
|
||||||
|
|
|
@ -1,7 +1,14 @@
|
||||||
|
#!/bin/sh -e
|
||||||
# launch my focus playlist
|
# launch my focus playlist
|
||||||
playlistPath="$MUSIC/Playlists"
|
playlistPath="$MUSIC/Playlists"
|
||||||
test -z "$1" && vp "$playlistPath/focus.m3u" ||
|
mpc clear
|
||||||
(find -L $playlistPath -iname "focus-$1.m3u" -print0 | grep --null-data . ||
|
if test -z "$1"
|
||||||
find -L $playlistPath -iname "$1.m3u*" -print0 | grep --null-data . ||
|
then mp -q "$playlistPath/focus.m3u"
|
||||||
find -L $MUSIC -iname "*$1*" -prune -exec find {} -size +2M -type f -not -iregex ".*.\(jpe?g\|png\)" -print0 \;) |
|
else
|
||||||
xargs -0 vp
|
(find -L $playlistPath -iname "focus-$1.m3u" -print0 | grep --null-data . ||
|
||||||
|
find -L $playlistPath -iname "$1.m3u*" -print0 | grep --null-data . ||
|
||||||
|
find -L $MUSIC -iname "*$1*" -prune -exec find {} -size +2M -type f -not -iregex ".*.\(jpe?g\|png\)" -print0 \; ) |
|
||||||
|
xargs -0 mp -q
|
||||||
|
fi
|
||||||
|
mpc -q shuffle
|
||||||
|
mpc next
|
||||||
|
|
|
@ -1,20 +1,29 @@
|
||||||
#!/bin/sh -e
|
#!/bin/sh
|
||||||
# Play given files on mpd, enabling playing of external files through symlinking and recursively resolving playlists
|
# Play given files on mpd, enabling playing of external files through symlinking and recursively resolving playlists
|
||||||
# depends: xargs mpc realpath
|
# depends: xargs mpc realpath
|
||||||
# env: MUSIC
|
# env: MUSIC
|
||||||
links="$MUSIC/links"
|
PLAYLISTS="$MUSIC/Playlists"
|
||||||
test "$1" = "-r" || next=true
|
LINKS="$MUSIC/links"
|
||||||
|
test "$1" = "-q" && quiet=-q && shift
|
||||||
|
test "$1" = "-v" && verbose=-v && shift
|
||||||
|
test "$1" = "-r" && shift || next=true
|
||||||
{ for arg;
|
{ for arg;
|
||||||
do path="$(test -e "$MUSIC/$arg" && echo "$MUSIC/$arg" || realpath "$arg")"
|
do path="$(test -e "$arg" && realpath "$arg" ||
|
||||||
|
( test -e "$MUSIC/$arg" && realpath "$MUSIC/$arg") ||
|
||||||
|
( test -e "$PLAYLISTS/$arg" && realpath "$PLAYLISTS/$arg") )"
|
||||||
|
test -n "$verbose" && echo "Scanning path '$path' from '$arg'" >&2
|
||||||
test -n "$path" || continue
|
test -n "$path" || continue
|
||||||
if file "$path" | grep -i ' playlist' || expr "$path" : ".*\.m3u8\?$" >/dev/null
|
if file "$path" | grep -i ' playlist' || expr "$path" : ".*\.m3u8\?$" >/dev/null
|
||||||
then pushd "$(dirname "$path")" >/dev/null && cat "$path" | xargs --delim='\n' play -r && popd >/dev/null
|
then pushd "$(dirname "$path")" >/dev/null && cat "$path" | xargs --delim='\n' "$0" $verbose -r && popd >/dev/null
|
||||||
else
|
else
|
||||||
find "$path" -name "*.flac" -o -name "*.mp3" | while read file
|
find "$path" -name "*.flac" -o -name "*.mp3" | while read file
|
||||||
do case "$path" in
|
do case "$path" in
|
||||||
($MUSIC/*) echo "${file/$MUSIC\/}";;
|
($MUSIC/*) echo "${file/$MUSIC\/}";;
|
||||||
(*) mkdir -p "$links" && ln -fs "$file" "$links/$(basename "$file")" && echo "links/$(basename "$file")";;
|
(*) mkdir -p "$LINKS" && ln -fs "$file" "$LINKS/$(basename "$file")" && echo "${LINKS#$MUSIC/}/$(basename "$file")";;
|
||||||
esac done
|
esac done
|
||||||
fi
|
fi
|
||||||
done && mpc update --wait -q; } | xargs --delim='\n' mpc insert
|
done && mpc -q update --wait; } | xargs --delim='\n' mpc insert
|
||||||
test "$next" && test "$(mpc status | wc -l)" -gt 1 || mpc play -q && mpc next
|
|
||||||
|
if test "$next"
|
||||||
|
then test $(mpc status | wc -l) -gt 1 && mpc $quiet next || mpc $quiet play
|
||||||
|
fi
|
||||||
|
|
Loading…
Reference in New Issue