4 files changed, 151 insertions, 12 deletions

diff --git a/.config/polybar/config##desktop.Linux.Lowe b/.config/polybar/config##desktop.Linux.Lowe
index f0670d5..488edc4 100644
--- a/.config/polybar/config##desktop.Linux.Lowe
+++ b/.config/polybar/config##desktop.Linux.Lowe
@@ -52,7 +52,7 @@ font-1 = Lato:size=10;1
 font-2 = Raleway:size=10;1
 font-3 = FuraCode Nerd Font:size=11;2
 
-modules-left = i3 pulseaudio spotify
+modules-left = i3 pulseaudio-control spotify
 modules-center = xwindow
 modules-right = focus date time xkeyboard
 
@@ -96,8 +96,8 @@ y-offset = 10
 label-padding = 1
 label-font = 1
 
-label-empty = ﳓ
-label-empty-font = 4
+label-empty = 
+label-empty-font = 3
 label-empty-padding = 5
 
 [module/xkeyboard]
@@ -108,11 +108,11 @@ blacklist-1 = scroll lock
 format = <label-layout> <label-indicator>
 format-spacing = 0
 
-format-prefix = ���
+format-prefix = ���
 format-prefix-padding = 1
 format-prefix-background = ${colors.blue}
 format-prefix-foreground = ${colors.foreground}
-format-prefix-font = 4
+format-prefix-font = 3
 
 label-layout = %layout%
 label-layout-padding = 1
@@ -202,7 +202,7 @@ format = <label>
 format-prefix = 
 format-prefix-background = ${colors.orange}
 format-prefix-foreground = ${colors.foreground}
-format-prefix-font = 4
+format-prefix-font = 3
 format-prefix-padding = 1
 
 label-background = ${colors.background_modules}
@@ -217,10 +217,10 @@ time = %H:%M
 label = %time%
 format = <label>
 
-format-prefix = 
+format-prefix = 
 format-prefix-background = ${colors.secondary}
 format-prefix-foreground = ${colors.foreground}
-format-prefix-font = 4
+format-prefix-font = 3
 format-prefix-padding = 1
 
 label-background = ${colors.background_modules}
@@ -233,10 +233,10 @@ interval = 5
 
 format-volume = <label-volume>
 
-format-volume-prefix = ♫
+format-volume-prefix = 
 format-volume-prefix-background = ${colors.purple}
 format-volume-prefix-foreground = ${colors.background_modules}
-format-volume-prefix-font = 4
+format-volume-prefix-font = 3
 format-volume-prefix-padding = 1
 
 label-volume = %percentage%
@@ -249,6 +249,22 @@ label-muted-background = ${colors.purple}
 label-muted-foreground = ${colors.foreground}
 label-muted-padding = 2
 
+[module/pulseaudio-control]
+type = custom/script
+tail = true
+label = %output%
+interval = 5
+
+exec = ~/.config/polybar/pulseaudio-control.sh --listen
+click-right = exec pavucontrol &
+click-left = ~/.config/polybar/pulseaudio-control.sh --togmute
+click-middle = ~/.config/polybar/pulseaudio-control.sh --change
+scroll-up = ~/.config/polybar/pulseaudio-control.sh --up
+scroll-down = ~/.config/polybar/pulseaudio-control.sh --down
+label-padding = 2
+label-foreground = ${colors.foreground_modules}
+label-background = ${colors.background_modules}
+
 [settings]
 screenchange-reload = true
 compositing-background = source
diff --git a/.config/polybar/config##desktop.Linux.Maus b/.config/polybar/config##desktop.Linux.Maus
index f9686ae..0c8ce3d 100644
--- a/.config/polybar/config##desktop.Linux.Maus
+++ b/.config/polybar/config##desktop.Linux.Maus
@@ -52,7 +52,7 @@ font-1 = Lato:size=10;1
 font-2 = Raleway:size=10;1
 font-3 = FuraCode Nerd Font:size=12;2
 
-modules-left = i3 mpd pulseaudio-control
+modules-left = i3 pulseaudio-control mpd
 modules-center = xwindow
 modules-right = focus date time xkeyboard
 
diff --git a/.config/polybar/pulseaudio-control.sh b/.config/polybar/pulseaudio-control.sh
index e88ce39..bdabf2f 100755
--- a/.config/polybar/pulseaudio-control.sh
+++ b/.config/polybar/pulseaudio-control.sh
@@ -14,7 +14,7 @@ VOLUME_ICONS=( " " " " " " )  # Volume icons array, from lower volume t
 MUTED_ICON=" "  # Muted volume icon
 MUTED_COLOR="%{F#A9AA83}"  # Color when the audio is muted
 DEFAULT_SINK_ICON="♫ "  # The default sink icon if a custom one isn't found
-CUSTOM_SINK_ICONS=("���" "���" "���")  # Custom sink icons in index of sink order
+CUSTOM_SINK_ICONS=("" "���")  # Custom sink icons in index of sink order
 NOTIFICATIONS="yes"  # Notifications when switching sinks if enabled
 SINK_BLACKLIST=(  )  # Index blacklist for sinks when switching between them
 
diff --git a/.config/polybar/spotify_status.py b/.config/polybar/spotify_status.py
new file mode 100644
index 0000000..3a56096
--- /dev/null
+++ b/.config/polybar/spotify_status.py
@@ -0,0 +1,123 @@
+#!/bin/python
+
+import sys
+import dbus
+import argparse
+
+parser = argparse.ArgumentParser()
+parser.add_argument(
+    '-t',
+    '--trunclen',
+    type=int,
+    metavar='trunclen'
+)
+parser.add_argument(
+    '-f',
+    '--format',
+    type=str,
+    metavar='custom format',
+    dest='custom_format'
+)
+parser.add_argument(
+    '-p',
+    '--playpause',
+    type=str,
+    metavar='play-pause indicator',
+    dest='play_pause'
+)
+parser.add_argument(
+    '--font',
+    type=str,
+    metavar='the index of the font to use for the main label',
+    dest='font'
+)
+parser.add_argument(
+    '--playpause-font',
+    type=str,
+    metavar='the index of the font to use to display the playpause indicator',
+    dest='play_pause_font'
+)
+
+
+args = parser.parse_args()
+
+def fix_string(string):
+    # corrects encoding for the python version used
+    if sys.version_info.major == 3:
+        return string
+    else:
+        return string.encode('utf-8')
+
+# Default parameters
+output = fix_string(u'{play_pause} {artist}: {song}')
+trunclen = 25
+play_pause = fix_string(u'\u25B6,\u23F8') # first character is play, second is paused
+
+label_with_font = '%{{T{font}}}{label}%{{T-}}'
+font = args.font
+play_pause_font = args.play_pause_font
+
+# parameters can be overwritten by args
+if args.trunclen is not None:
+    trunclen = args.trunclen
+if args.custom_format is not None:
+    output = args.custom_format
+if args.play_pause is not None:
+    play_pause = args.play_pause
+
+try:
+    session_bus = dbus.SessionBus()
+    spotify_bus = session_bus.get_object(
+        'org.mpris.MediaPlayer2.spotify',
+        '/org/mpris/MediaPlayer2'
+    )
+
+    spotify_properties = dbus.Interface(
+        spotify_bus,
+        'org.freedesktop.DBus.Properties'
+    )
+
+    metadata = spotify_properties.Get('org.mpris.MediaPlayer2.Player', 'Metadata')
+    status = spotify_properties.Get('org.mpris.MediaPlayer2.Player', 'PlaybackStatus')
+
+    # Handle play/pause label
+
+    play_pause = play_pause.split(',')
+
+    if status == 'Playing':
+        play_pause = play_pause[0]
+    elif status == 'Paused':
+        play_pause = play_pause[1]
+    else:
+        play_pause = str()
+
+    if play_pause_font:
+        play_pause = label_with_font.format(font=play_pause_font, label=play_pause)
+
+    # Handle main label
+
+    artist = fix_string(metadata['xesam:artist'][0]) if metadata['xesam:artist'] else ''
+    song = fix_string(metadata['xesam:title']) if metadata['xesam:title'] else ''
+    album = fix_string(metadata['xesam:album']) if metadata['xesam:album'] else ''
+
+    if not artist and not song and not album:
+        print('')
+    else:
+        if len(song) > trunclen:
+            song = song[0:trunclen]
+            song += '...'
+            if ('(' in song) and (')' not in song):
+                song += ')'
+
+        if font:
+            artist = label_with_font.format(font=font, label=artist)
+            song = label_with_font.format(font=font, label=song)
+            album = label_with_font.format(font=font, label=album)
+
+        print(output.format(artist=artist, song=song, play_pause=play_pause, album=album))
+
+except Exception as e:
+    if isinstance(e, dbus.exceptions.DBusException):
+        print('')
+    else:
+        print(e)