EvolutionOS
/
neofetch
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #976 from dylanaraps/song_album3 

Fix issues with album addition to get_song
This commit is contained in:
Andrew Titmuss 2018-05-09 20:20:57 +10:00 committed by GitHub
parent d8436768a0 cfcd6fff17
commit 94a2bf6ec0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
neofetch
View File

@ -1423,18 +1423,18 @@ guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 "
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} /album"/ {b=$2} /title/ {t=$2} END{print a " - " b " - " 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 -f '%artist% - %album% - %title%' current)" ;; "mpd"* | "mopidy"*) song="$(mpc -f '%artist% ‡ %album% ‡ %title%' current)" ;;
"mocp"*) song="$(mocp -Q "%artist - %album - %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-format '%ta - %at - %tt')" ;; "rhythmbox"*) song="$(rhythmbox-client --print-playing-format '%ta ‡ %at ‡ %tt')" ;;
"deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist% - %album% - %title%')" ;; "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist% ‡ %album% ‡ %title%')" ;;
"xmms2d"*) song="$(xmms2 current -f '${artist} - ${album} - ${title}')" ;; "xmms2d"*) song="$(xmms2 current -f '${artist} ‡ ${album} ‡ ${title}')" ;;
"qmmp"*) song="$(qmmp --nowplaying '%p - %a - %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" ;;
@ -1456,7 +1456,7 @@ guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 "
/tag artist/ {$1=$2=""; sub(" ", ""); a=$0}\ /tag artist/ {$1=$2=""; sub(" ", ""); a=$0}\
/tag album / {$1=$2=""; sub(" ", ""); b=$0}\ /tag album / {$1=$2=""; sub(" ", ""); b=$0}\
/tag title/ {$1=$2=""; sub(" ", ""); t=$0}\ /tag title/ {$1=$2=""; sub(" ", ""); t=$0}\
END { print a " - " b " - " t }')" END { print a " ‡ " b " ‡ " t }')"
;; ;;
"spotify"*) "spotify"*)
@ -1465,76 +1465,73 @@ guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 "
"Mac OS X") "Mac OS X")
song="$(osascript -e 'tell application "Spotify" to artist of current track as¬ song="$(osascript -e 'tell application "Spotify" to artist of current track as¬
string & " - " & album of current track as¬ string & " ‡ " & album of current track as¬
string & " - " & name of current track as string')" string & " ‡ " & name of current track as string')"
;; ;;
esac esac
;; ;;
"itunes"*) "itunes"*)
song="$(osascript -e 'tell application "iTunes" to artist of current track as¬ song="$(osascript -e 'tell application "iTunes" to artist of current track as¬
string & " - " & album of current track as¬ string & " ‡ " & album of current track as¬
string & " - " & name of current track as string')" string & " ‡ " & name of current track as string')"
;; ;;
"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 " - " b " - "t}')" 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} /^album:/ {b=$2} /^title:/ {t=$2} awk -F':' '/^artist:/ {a=$2} /^album:/ {b=$2} /^title:/ {t=$2}
END{print a " - " b " - " t}')" END{print a " ‡ " b " ‡ " t}')"
;; ;;
"pragha"*) "pragha"*)
song="$(pragha -c | awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2} song="$(pragha -c | awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2}
END{print a " - " b " - " t}')" 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 | org.exaile.Exaile.Query |
awk -F':|,' '{if ($6 && $8 && $4) printf $6 " -" $8 " -" $4}')" 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} /album/ {getline; b=$2} awk -F'"' '/artist/ {getline; a=$2} /album/ {getline; b=$2}
/title/ {getline; t=$2} END{print a " - " b " - " 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 "album"/ {getline; b=$2} \ awk -F'"' '/string "artist"/ {getline; a=$2} /string "album"/ {getline; b=$2} \
/string "title"/ {getline; t=$2} END{print a " - " b " - " t}')" /string "title"/ {getline; t=$2} END{print a " ‡ " b " ‡ " t}')"
;; ;;
*) mpc >/dev/null 2>&1 && song="$(mpc -f '%artist% - %album% - %title%' current)" ;; *) mpc >/dev/null 2>&1 && song="$(mpc -f '%artist% ‡ %album% ‡ %title%' current)" ;;
esac esac
# TODO: adjust for album: "$(trim "$song")" == "- -" [[ "$song" != *[a-z]* ]] && unset -v song
[[ "$(trim "$song")" == "-" ]] && unset -v song
# Display Artist, Album 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/ -*}" artist="${song/ ‡*}"
album="${song#*- }" album="${song#*‡ }"
album="${album% -*}" album="${album% ‡*}"
song="${song/*-}" song="${song/*‡}"
if [[ "$song" != "$artist" ]]; then [[ "$(trim "$artist")" ]] && prin "Artist" "$artist"
prin "Artist" "$artist" [[ "$(trim "$album")" ]] && prin "Album" "$album"
prin "Album" "$album" [[ "$(trim "$song")" ]] && prin "Song" "$song"
prin "Song" "$song"
else
prin "$subtitle" "$song"
fi
fi fi
song="${song//‡/-}"
} }
get_resolution() { get_resolution() {