Merge pull request #837 from dylanaraps/song-album
Add Album to the Song function
This commit is contained in:
Dylan Araps
GitHub
commit
e8ac76dc57
93
neofetch
93
neofetch
|
|
@ -2392,18 +2392,18 @@ 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 'string "' '/string|array/ {printf "%s",$2; next}{print ""}' |\
|
awk -F 'string "' '/string|array/ {printf "%s",$2; next}{print ""}' |\
|
||||||
awk -F '"' '/artist/ {a=$2} /title/ {t=$2} END{print a " - " t}'
|
awk -F '"' '/artist/ {a=$2} /album"/ {b=$2} /title/ {t=$2} END{print a " ‡ " b " ‡ " t}'
|
||||||
)"
|
)"
|
||||||
}
|
}
|
||||||
|
|
||||||
case "${player/*\/}" in
|
case "${player/*\/}" in
|
||||||
"mpd"* | "mopidy"*) song="$(mpc current)" ;;
|
"mpd"* | "mopidy"*) song="$(mpc -f '%artist% ‡ %album% ‡ %title%' current)" ;;
|
||||||
"mocp"*) song="$(mocp -Q "%artist - %song")" ;;
|
"mocp"*) song="$(mocp -Q "%artist ‡ %album ‡ %song")" ;;
|
||||||
"google play"*) song="$(gpmdp-remote current)" ;;
|
"google play"*) song="$(gpmdp-remote current)" ;;
|
||||||
"rhythmbox"*) song="$(rhythmbox-client --print-playing)" ;;
|
"rhythmbox"*) song="$(rhythmbox-client --print-playing-format '%ta ‡ %at ‡ %tt')" ;;
|
||||||
"deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist% - %title%')" ;;
|
"deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist% ‡ %album% ‡ %title%')" ;;
|
||||||
"xmms2d"*) song="$(xmms2 current -f '${artist} - ${title}')" ;;
|
"xmms2d"*) song="$(xmms2 current -f '${artist} ‡ ${album} ‡ ${title}')" ;;
|
||||||
"qmmp"*) song="$(qmmp --nowplaying '%p - %t')" ;;
|
"qmmp"*) song="$(qmmp --nowplaying '%p ‡ %a ‡ %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" ;;
|
||||||
|
|
@ -2417,16 +2417,15 @@ get_song() {
|
||||||
|
|
||||||
"audacious"*)
|
"audacious"*)
|
||||||
song="$(audtool current-song)"
|
song="$(audtool current-song)"
|
||||||
|
[[ -z "$song" || "$song_shorthand" == "on" ]] && get_song_dbus "audacious"
|
||||||
# Remove Album from 'Artist - Album - Title'
|
|
||||||
song="${song/-* -/-}"
|
|
||||||
|
|
||||||
[[ -z "$song" ]] && get_song_dbus "audacious"
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"cmus"*)
|
"cmus"*)
|
||||||
song="$(cmus-remote -Q | awk '/tag artist/ {$1=$2=""; print; print " - "}\
|
song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "};
|
||||||
/tag title/ {$1=$2=""; print}')"
|
/tag artist/ {$1=$2=""; sub(" ", ""); a=$0}\
|
||||||
|
/tag album / {$1=$2=""; sub(" ", ""); b=$0}\
|
||||||
|
/tag title/ {$1=$2=""; sub(" ", ""); t=$0}\
|
||||||
|
END { print a " ‡ " b " ‡ " t }')"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"spotify"*)
|
"spotify"*)
|
||||||
|
|
@ -2434,81 +2433,71 @@ get_song() {
|
||||||
"Linux") get_song_dbus "spotify" ;;
|
"Linux") get_song_dbus "spotify" ;;
|
||||||
|
|
||||||
"Mac OS X")
|
"Mac OS X")
|
||||||
song="$(osascript <<END
|
song="$(osascript -e 'tell application "Spotify" to artist of current track as¬
|
||||||
if application "Spotify" is running then
|
string & " ‡ " & album of current track as¬
|
||||||
tell application "Spotify"
|
string & " ‡ " & name of current track as string')"
|
||||||
artist of current track as string & \
|
|
||||||
" - " & name of current track as string
|
|
||||||
end tell
|
|
||||||
end if
|
|
||||||
END
|
|
||||||
)"
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"itunes"*)
|
"itunes"*)
|
||||||
song="$(osascript <<END
|
song="$(osascript -e 'tell application "iTunes" to artist of current track as¬
|
||||||
if application "iTunes" is running then
|
string & " ‡ " & album of current track as¬
|
||||||
tell application "iTunes"
|
string & " ‡ " & name of current track as string')"
|
||||||
artist of current track as string & \
|
|
||||||
" - " & name of current track as string
|
|
||||||
end tell
|
|
||||||
end if
|
|
||||||
END
|
|
||||||
)"
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"banshee"*)
|
"banshee"*)
|
||||||
song="$(banshee --query-artist --query-title |\
|
song="$(banshee --query-artist --query-album --query-title |\
|
||||||
awk -F':' '/^artist/ {a=$2} /^title/ {t=$2} END{print a " - " t}')"
|
awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2}
|
||||||
|
END{print a " ‡ " b " ‡ "t}')"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"amarok"*)
|
"amarok"*)
|
||||||
song="$(qdbus org.kde.amarok /Player GetMetadata |\
|
song="$(qdbus org.kde.amarok /Player GetMetadata |\
|
||||||
awk -F':' '/^artist/ {a=$2} /^title/ {t=$2} END{print a " - " t}')"
|
awk -F':' '/^artist:/ {a=$2} /^album:/ {b=$2} /^title:/ {t=$2}
|
||||||
|
END{print a " ‡ " b " ‡ " t}')"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"pragha"*)
|
"pragha"*)
|
||||||
song="$(pragha -c | awk -F':' '/^artist/ {a=$2} /^title/ {t=$2} END{print a " - " t}')"
|
song="$(pragha -c | awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2}
|
||||||
|
END{print a " ‡ " b " ‡ " t}')"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"exaile"*)
|
"exaile"*)
|
||||||
song="$(dbus-send --print-reply --dest=org.exaile.Exaile /org/exaile/Exaile \
|
song="$(dbus-send --print-reply --dest=org.exaile.Exaile /org/exaile/Exaile \
|
||||||
org.exaile.Exaile.Query | awk -F':|,' '{if ($6 && $4) printf $6 " -" $4}')"
|
org.exaile.Exaile.Query |
|
||||||
|
awk -F':|,' '{if ($6 && $8 && $4) printf $6 " ‡" $8 " ‡" $4}')"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"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'"' '/artist/ {getline; a=$2} \
|
awk -F'"' '/artist/ {getline; a=$2} /album/ {getline; b=$2}
|
||||||
/title/ {getline; t=$2} END{print a " - " t}')"
|
/title/ {getline; t=$2} END{print a " ‡ " b " ‡ " 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'"' '/string "artist"/ {getline; a=$2} /string "title"/ {getline; t=$2} \
|
awk -F'"' '/string "artist"/ {getline; a=$2} /string "album"/ {getline; b=$2} \
|
||||||
END{print a " - " t}')"
|
/string "title"/ {getline; t=$2} END{print a " ‡ " b " ‡ " t}')"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*) mpc >/dev/null 2>&1 && song="$(mpc current)" ;;
|
*) mpc >/dev/null 2>&1 && song="$(mpc -f '%artist% ‡ %album% ‡ %title%' current)" ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
[[ "$(trim "$song")" == "-" ]] && unset -v song
|
[[ "$song" != *[a-z]* ]] && unset -v song
|
||||||
|
|
||||||
# Display Artist and Title on separate lines.
|
# Display Artist, Album and Title on separate lines.
|
||||||
if [[ "$song_shorthand" == "on" && "$song" ]]; then
|
if [[ "$song_shorthand" == "on" && "$song" ]]; then
|
||||||
artist="${song/ -*}"
|
LC_ALL="$sys_locale" IFS="‡" read -r artist album song <<< "$song"
|
||||||
song="${song/*-}"
|
|
||||||
|
|
||||||
if [[ "$song" != "$artist" ]]; then
|
[[ "$(trim "$artist")" ]] && prin "Artist" "$artist"
|
||||||
prin "Artist" "$artist"
|
[[ "$(trim "$album")" ]] && prin "Album" "$album"
|
||||||
prin "Song" "$song"
|
[[ "$(trim "$song")" ]] && prin "Song" "$song"
|
||||||
else
|
|
||||||
prin "$subtitle" "$song"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
song="${song//‡/-}"
|
||||||
}
|
}
|
||||||
|
|
||||||
get_resolution() {
|
get_resolution() {
|
||||||
|
|
|
||||||
Reference in New Issue