luisgulo/neofetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1382 from arisinfenix/song

Browse source 
song: print empty tags correctly
This commit is contained in:
dylan 2019-12-29 21:41:47 +00:00 committed by GitHub
commit 0b3e3a5968
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
neofetch
View file

@ -2596,16 +2596,14 @@ get_song() {
org.freedesktop.DBus.Properties.Get string:'org.mpris.MediaPlayer2.Player' \ org.freedesktop.DBus.Properties.Get string:'org.mpris.MediaPlayer2.Player' \
string:'Metadata' |\ string:'Metadata' |\
awk -F '"' 'BEGIN {RS=" entry"}; /"xesam:artist"/ {a = $4} /"xesam:album"/ {b = $4} awk -F '"' 'BEGIN {RS=" entry"}; /"xesam:artist"/ {a = $4} /"xesam:album"/ {b = $4}
/"xesam:title"/ {t = $4} END {print a "\n" b "\n" t}' /"xesam:title"/ {t = $4} END {print a " \n" b " \n" t}'
)" )"
} }
case ${player/*\/} in case ${player/*\/} in
"mpd"*|"mopidy"*) song="$(mpc -f '%artist%\n%album%\n%title%' current "${mpc_args[@]}")" ;; "mocp"*) song="$(mocp -Q '%artist \n%album \n%song')" ;;
"mocp"*) song="$(mocp -Q '%artist\n%album\n%song')" ;; "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist% \\n%album% \\n%title%')" ;;
"deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist%\\n%album%\\n%title%')" ;; "qmmp"*) song="$(qmmp --nowplaying '%p \n%a \n%t')" ;;
"xmms2d"*) song="$(xmms2 current -f "\${artist}"$'\n'"\${album}"$'\n'"\${title}")" ;;
"qmmp"*) song="$(qmmp --nowplaying '%p\\n%a\\n%t')" ;;
"gnome-music"*) get_song_dbus "GnomeMusic" ;; "gnome-music"*) get_song_dbus "GnomeMusic" ;;
"lollypop"*) get_song_dbus "Lollypop" ;; "lollypop"*) get_song_dbus "Lollypop" ;;
"clementine"*) get_song_dbus "clementine" ;; "clementine"*) get_song_dbus "clementine" ;;
@ -2632,19 +2630,20 @@ get_song() {
"plasma-browser-integration"*) get_song_dbus "plasma-browser-integration" ;; "plasma-browser-integration"*) get_song_dbus "plasma-browser-integration" ;;
"io.elementary.music"*) get_song_dbus "Music" ;; "io.elementary.music"*) get_song_dbus "Music" ;;
"mpd"* | "mopidy"*)
song="$(mpc -f '%artist% \n%album% \n%title%' current "${mpc_args[@]}")"
;;
"xmms2d"*)
song="$(xmms2 current -f "\${artist}"$' \n'"\${album}"$' \n'"\${title}")"
;;
"cmus"*) "cmus"*)
# NOTE: cmus >= 2.8.0 supports mpris2 # NOTE: cmus >= 2.8.0 supports mpris2
song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "}; song="$(cmus-remote -Q | awk '/tag artist/ {$1=$2=""; a=$0}
/tag artist/ { /tag album / {$1=$2=""; b=$0}
$1=$2=""; sub(" ", ""); a=$0 /tag title/ {$1=$2=""; t=$0}
} END {print a " \n" b " \n" t}')"
/tag album / {
$1=$2=""; sub(" ", ""); b=$0
}
/tag title/ {
$1=$2=""; sub(" ", ""); t=$0
}
END { print a "\n" b "\n" t }')"
;; ;;
"spotify"*) "spotify"*)
@ -2668,7 +2667,7 @@ get_song() {
"banshee"*) "banshee"*)
song="$(banshee --query-artist --query-album --query-title |\ song="$(banshee --query-artist --query-album --query-title |\
awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2} awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2}
END {print a "\n" b "\n"t}')" END {print a " \n" b " \n"t}')"
;; ;;
"exaile"*) "exaile"*)
@ -2678,31 +2677,31 @@ get_song() {
awk -F ':' '{sub(",[^,]*$", "", $3); t=$3; awk -F ':' '{sub(",[^,]*$", "", $3); t=$3;
sub(",[^,]*$", "", $4); a=$4; sub(",[^,]*$", "", $4); a=$4;
sub(",[^,]*$", "", $5); b=$5} sub(",[^,]*$", "", $5); b=$5}
END {print a "\n" b "\n" t}')" END {print a " \n" b " \n" t}')"
;; ;;
"muine"*) "muine"*)
song="$(dbus-send --print-reply --dest=org.gnome.Muine /org/gnome/Muine/Player \ song="$(dbus-send --print-reply --dest=org.gnome.Muine /org/gnome/Muine/Player \
org.gnome.Muine.Player.GetCurrentSong | org.gnome.Muine.Player.GetCurrentSong |
awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2} awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2}
END {print a "\n" b "\n" t}')" END {print a " \n" b " \n" t}')"
;; ;;
"quodlibet"*) "quodlibet"*)
song="$(dbus-send --print-reply --dest=net.sacredchao.QuodLibet \ song="$(dbus-send --print-reply --dest=net.sacredchao.QuodLibet \
/net/sacredchao/QuodLibet net.sacredchao.QuodLibet.CurrentSong |\ /net/sacredchao/QuodLibet net.sacredchao.QuodLibet.CurrentSong |\
awk -F'"' 'BEGIN {RS=" entry"}; /"artist"/ {a=$4} /"album"/ {b=$4} awk -F'"' 'BEGIN {RS=" entry"}; /"artist"/ {a=$4} /"album"/ {b=$4}
/"title"/ {t=$4} END {print a "\n" b "\n" t}')" /"title"/ {t=$4} END {print a " \n" b " \n" t}')"
;; ;;
"pogo"*) "pogo"*)
song="$(dbus-send --print-reply --dest=org.mpris.pogo /Player \ song="$(dbus-send --print-reply --dest=org.mpris.pogo /Player \
org.freedesktop.MediaPlayer.GetMetadata | org.freedesktop.MediaPlayer.GetMetadata |
awk -F'"' 'BEGIN {RS=" entry"}; /"artist"/ {a=$4} /"album"/ {b=$4} awk -F'"' 'BEGIN {RS=" entry"}; /"artist"/ {a=$4} /"album"/ {b=$4}
/"title"/ {t=$4} END {print a "\n" b "\n" t}')" /"title"/ {t=$4} END {print a " \n" b " \n" t}')"
;; ;;
*) mpc &>/dev/null && song="$(mpc -f '%artist%\n%album%\n%title%' current)" || return ;; *) mpc &>/dev/null && song="$(mpc -f '%artist% \n%album% \n%title%' current)" || return ;;
esac esac
IFS=$'\n' read -d "" -r artist album title <<< "${song//'\n'/$'\n'}" IFS=$'\n' read -d "" -r artist album title <<< "${song//'\n'/$'\n'}"