Merge pull request #837 from dylanaraps/song-album

Add Album to the Song function

neofetch

@@ -2392,18 +2392,18 @@ get_song() {
             org.freedesktop.DBus.Properties.Get string:'org.mpris.MediaPlayer2.Player' \
             string:'Metadata' |\
             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
-        "mpd"* | "mopidy"*) song="$(mpc current)" ;;
-        "mocp"*)         song="$(mocp -Q "%artist - %song")" ;;
+        "mpd"* | "mopidy"*) song="$(mpc -f '%artist% ‡ %album% ‡ %title%' current)" ;;
+        "mocp"*)         song="$(mocp -Q "%artist ‡ %album ‡ %song")" ;;
         "google play"*)  song="$(gpmdp-remote current)" ;;
-        "rhythmbox"*)    song="$(rhythmbox-client --print-playing)" ;;
-        "deadbeef"*)     song="$(deadbeef --nowplaying-tf  '%artist% - %title%')" ;;
-        "xmms2d"*)       song="$(xmms2 current -f '${artist} - ${title}')" ;;
-        "qmmp"*)         song="$(qmmp --nowplaying '%p - %t')" ;;
+        "rhythmbox"*)    song="$(rhythmbox-client --print-playing-format '%ta ‡ %at ‡ %tt')" ;;
+        "deadbeef"*)     song="$(deadbeef --nowplaying-tf '%artist% ‡ %album% ‡ %title%')" ;;
+        "xmms2d"*)       song="$(xmms2 current -f '${artist} ‡ ${album} ‡ ${title}')" ;;
+        "qmmp"*)         song="$(qmmp --nowplaying '%p ‡ %a ‡ %t')" ;;
         "gnome-music"*)  get_song_dbus "GnomeMusic" ;;
         "lollypop"*)     get_song_dbus "Lollypop" ;;
         "clementine"*)   get_song_dbus "clementine" ;;
@@ -2417,16 +2417,15 @@ get_song() {
 
         "audacious"*)
             song="$(audtool current-song)"
-
-            # Remove Album from 'Artist - Album - Title'
-            song="${song/-* -/-}"
-
-            [[ -z "$song" ]] && get_song_dbus "audacious"
+            [[ -z "$song" || "$song_shorthand" == "on" ]] && get_song_dbus "audacious"
         ;;
 
         "cmus"*)
-            song="$(cmus-remote -Q | awk '/tag artist/ {$1=$2=""; print; print " - "}\
-                                          /tag title/ {$1=$2=""; print}')"
+            song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "};
+                                          /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"*)
@@ -2434,81 +2433,71 @@ get_song() {
                 "Linux") get_song_dbus "spotify" ;;
 
                 "Mac OS X")
-                    song="$(osascript <<END
-                            if application "Spotify" is running then
-                                tell application "Spotify"
-                                    artist of current track as string & \
-                                    " - " & name of current track as string
-                                end tell
-                            end if
-END
-)"
+                    song="$(osascript -e 'tell application "Spotify" to artist of current track as¬
+                                          string & " ‡ " & album of current track as¬
+                                          string & " ‡ " & name of current track as string')"
                 ;;
             esac
         ;;
 
         "itunes"*)
-            song="$(osascript <<END
-                    if application "iTunes" is running then
-                        tell application "iTunes"
-                            artist of current track as string & \
-                            " - " & name of current track as string
-                        end tell
-                    end if
-END
-)"
+            song="$(osascript -e 'tell application "iTunes" to artist of current track as¬
+                                  string & " ‡ " & album of current track as¬
+                                  string & " ‡ " & name of current track as string')"
         ;;
 
         "banshee"*)
-            song="$(banshee --query-artist --query-title |\
-                    awk -F':' '/^artist/ {a=$2} /^title/ {t=$2} END{print a " - " t}')"
+            song="$(banshee --query-artist --query-album --query-title |\
+                    awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2}
+                    END{print a " ‡ " b " ‡ "t}')"
         ;;
 
         "amarok"*)
             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"*)
-            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"*)
             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"*)
             song="$(dbus-send --print-reply --dest=net.sacredchao.QuodLibet \
                     /net/sacredchao/QuodLibet net.sacredchao.QuodLibet.CurrentSong |\
-                    awk -F'"' '/artist/ {getline; a=$2} \
-                               /title/ {getline; t=$2} END{print a " - " t}')"
+                    awk -F'"' '/artist/ {getline; a=$2} /album/ {getline; b=$2}
+                               /title/ {getline; t=$2} END{print a " ‡ " b " ‡ " t}')"
         ;;
 
         "pogo"*)
             song="$(dbus-send --print-reply --dest=org.mpris.pogo /Player \
                     org.freedesktop.MediaPlayer.GetMetadata |
-                    awk -F'"' '/string "artist"/ {getline; a=$2} /string "title"/ {getline; t=$2} \
-                               END{print a " - " t}')"
+                    awk -F'"' '/string "artist"/ {getline; a=$2} /string "album"/ {getline; b=$2} \
+                               /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
 
-    [[ "$(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
-        artist="${song/ -*}"
-        song="${song/*-}"
+        LC_ALL="$sys_locale" IFS="‡" read -r artist album song <<< "$song"
 
-        if [[ "$song" != "$artist" ]]; then
-            prin "Artist" "$artist"
-            prin "Song" "$song"
-        else
-            prin "$subtitle" "$song"
-        fi
+        [[ "$(trim "$artist")" ]] && prin "Artist" "$artist"
+        [[ "$(trim "$album")" ]]  && prin "Album" "$album"
+        [[ "$(trim "$song")" ]]   && prin "Song" "$song"
     fi
+
+    song="${song//‡/-}"
 }
 
 get_resolution() {