Music and multimedia player updated

This commit is contained in:
i.ortega 2020-05-03 11:55:24 +02:00
parent 10e5517c8e
commit 08467b6ba2
3 changed files with 11 additions and 9 deletions

View File

@ -11,6 +11,7 @@ export EDITOR="vim"
export VIDEO_FORMATS="mp4,mkv,avi,ogv,webm,divx,wmv,flv"
export AUDIO_FORMATS="mp3,ogg,vorbis,opus,aac,wav,3gp,mpg,flac"
export YTDL_FORMAT='bestvideo[height=1080]+bestaudio/bestvideo[height=1440]+bestaudio/[height=1080]/[height=1440]/bestvideo[height<2160]+bestaudio/bestvideo+bestaudio/best'
# export YTDL_FORMAT='bestvideo[height=1080][fps=30]+bestaudio/bestvideo[height=1080]+bestaudio/bestvideo[height=1440]+bestaudio/[height=1080]/[height=1440]/bestvideo[height<2160]+bestaudio/bestvideo+bestaudio/best'
export VIDEOPLAYER="mpv --ytdl-format=$YTDL_FORMAT"
export VIDEOPLAYER_SELECT_YTDLFORMAT="mpv --ytdl-format="
export AUDIOPLAYER="mpv"

View File

@ -1,23 +1,23 @@
#!/usr/bin/env sh
formats="$(dash -c "printf \"%b\n\" \$$(printf "%b\n" $1)_FORMATS")"
player="$(dash -c "printf \"%b\n\" \$$(printf "%b\n" $1)PLAYER")"
formats=$(dash -c "printf \"%b\n\" \$$(printf "%b\n" $1)_FORMATS")
player=$(dash -c "printf \"%b\n\" \$$(printf "%b\n" $1)PLAYER")
formats="$(printf "%b\n" "$formats" | sed 's/,/\\|/g')"
formats=$(printf "%b\n" "$formats" | sed 's/,/\\|/g')
regex=".*\\.\($formats\)"
trash="\($(printf "%b\n" "$TRASH" | sed 's/:/\/.*\\|/')/.*\)"
multimedia="$(find "$HOME" -regex "$regex" -not -regex "$trash")"
multimedia="$(printf "%b\n" "$multimedia" | sed "s|^$HOME/||")"
multimedia=$(find "$HOME" -regex "$regex" -not -regex "$trash")
multimedia=$(printf "%b\n" "$multimedia" | sed "s|^$HOME/||")
multimedia="${multimedia}$(find "$DEVICES_FOLDER" -regex "$regex" \
-not -regex "$trash")"
multimedia=${multimedia}$(find "$DEVICES_FOLDER" -regex "$regex" \
-not -regex "$trash")
media="$(printf "%b\n" "${multimedia}" | dmenu -i -l 9)"
media=$(printf "%b\n" "${multimedia}" | dmenu -i -l 9)
[ "$(printf "%b\n" "$media" | grep -E "$DEVICES_FOLDER/.*" | wc -l)" -eq 0 ] &&
media="$HOME/$media"
[ "$media" != "$HOME/" ] && dash -c "$player \"$media\""
[ "$media" != "$HOME/" ] && $player "$media"

View File

@ -30,6 +30,7 @@ case "$MUSICPLAYER" in
sleep 1
done
mocp -c
sleep 1
mocp -a ~/Music/music
mocp -p
;;