From c49a69e6ac7c4da458101fa544ea2431fa134558 Mon Sep 17 00:00:00 2001
From: David Luevano Alvarado <55825613+luevano@users.noreply.github.com>
Date: Tue, 29 Dec 2020 17:15:50 -0700
Subject: Fix bugs

---
 .local/bin/statusbar/player_mpris_zscroll_module | 51 ++++++++++++++++--------
 1 file changed, 34 insertions(+), 17 deletions(-)

(limited to '.local/bin/statusbar')

diff --git a/.local/bin/statusbar/player_mpris_zscroll_module b/.local/bin/statusbar/player_mpris_zscroll_module
index 6645e4c..ffe8f36 100755
--- a/.local/bin/statusbar/player_mpris_zscroll_module
+++ b/.local/bin/statusbar/player_mpris_zscroll_module
@@ -23,29 +23,46 @@ show_panel (){
 }
 
 send_notification (){
-	player_status=$(playerctl status 2> /dev/null)
-	if [ "$player_status" = "Playing" ]; then
-		artist="$(playerctl metadata artist)"
-		album="$(playerctl metadata album)"
-		title="$(playerctl metadata title)"
-
-		if [ $album = "\n"]; then
-			notify-send "$icon $artist - $album" "$title"
+	player_status="$(pctl_status status)"
+
+	metadata="$(pctl_status get-metadata)"
+	contains_album="$(echo $metadata | cut -d'>' -f1)"
+
+	artist=
+	album=
+	title=
+
+	summary=
+	body=
+
+	pp_icon=
+
+	if [ "$player_status" = "Playing" ] || [ "$player_status" = "Paused" ]; then
+		if [ "$contains_album" = "yes" ]; then
+			artist="$(echo $metadata | cut -d'>' -f2)"
+			album="$(echo $metadata | cut -d'>' -f3)"
+			title="$(echo $metadata | cut -d'>' -f4)"
+
+			summary="$artist ($album)"
+			body="$title"
+
 		else
-			notify-send "$icon $artist" "$title"
+			artist="$(echo $metadata | cut -d'>' -f2)"
+			title="$(echo $metadata | cut -d'>' -f3)"
+
+			summary="$artist"
+			body="$title"
 		fi
-	elif [ "$player_status" = "Paused" ]; then
-		artist="$(playerctl metadata artist)"
-		album="$(playerctl metadata album)"
-		title="$(playerctl metadata title)"
 
-		if [ $album = "\n"]; then
-			notify-send "$icon (Paused) $artist - $album" "$title"
+		if [ "$player_status" = "Playing" ]; then
+			pp_icon=""
 		else
-			notify-send "$icon (Paused) $artist" "$title"
+			pp_icon=""
 		fi
+
+		notify-send -u low "$icon $pp_icon $summary" "$body"
 	else
-		notify-send "$icon Nothing playing"
+		notify-send -u low "$icon Nothing playing"
 	fi
 
 }
-- 
cgit v1.2.3-54-g00ecf