Adding Support for MPD

lyrics/lyrics.cfg

@@ -6,6 +6,9 @@ source=google
 interval=1500
 player=spotify
 autoswitch=on
+mpd_host=127.0.0.1
+mpd_port=6600
+mpd_pass=
 #colors
 #offset=1
 

lyrics/lyrics_in_terminal.py

@@ -46,13 +46,13 @@ def start(stdscr):
 
  interval = defaults['interval']
  source = defaults['source']
-
- player = Player(player_name, source, autoswitch, align=align)
+ mpd_connect = [defaults['mpd_host'],defaults['mpd_port'],defaults['mpd_pass']] 
+
+ player = Player(player_name, source, autoswitch, mpd_connect, align=align)
  win = Window(stdscr, player, timeout=interval)
 
  win.main()
 
-
 if __name__ == '__main__':
  if len(sys.argv) >= 2:
  if sys.argv[1] == '-t':

lyrics/player.py

@@ -4,10 +4,10 @@
 
 import dbus
 import re
-
+from mpd import MPDClient as mpd
 
 class Player:
- def __init__(self, name, source, autoswitch, **kwargs):
+ def __init__(self, name, source, autoswitch, mpd_connect, **kwargs):
  self.player_name = name
  self.default_source = source
 
@@ -17,7 +17,9 @@ def __init__(self, name, source, autoswitch, **kwargs):
  self.track = Track(**kwargs)
 
  self.player_interface = None
-
+ self.mpd_host = mpd_connect[0] or '127.0.0.1'
+ self.mpd_port = mpd_connect[1] or 6600
+ self.mpd_pass = mpd_connect[2] or ''
  self.update()
 
  def check_playing(self):
@@ -57,6 +59,33 @@ def get_active_player(self):
  return
 
 
+ def mpd_active(self):
+ """ Check if mpd is active and get metadata """
+ client = mpd()
+ try: client.connect(self.mpd_host,self.mpd_port)
+ except Exception as e:
+ print(e)
+ if self.mpd_pass != '':
+ client.password(self.mpd_pass)
+ if client.status()['state'] == 'play':
+ self.player_name = "mpd"
+ self.running2 = True
+ currentsong = client.currentsong()
+ if 'album' in currentsong: album = currentsong['album']
+ else: album = ''
+ title = currentsong['title']
+ title2 = currentsong['title']
+ artist = currentsong['artist']
+ album = album
+ trackid = currentsong['id']
+ if self.track.title != title:
+ self.track.update(artist, title, album, trackid)
+ self.refresh()
+ return True
+ else:
+ self.running2 = False 
+ return False
+
  def get_bus(self):
  ''' gets dbus session bus and player interface
  '''
@@ -90,7 +119,8 @@ def update(self):
  except Exception as e:
  self.running = False
  self.player_interface = None
-
+
+
  if self.running:
  try:
  title = metadata['xesam:title']
@@ -126,7 +156,11 @@ def update(self):
  self.track.update(artist, title, album, trackid)
  self.refresh()
  return True
-
+
+ if not self.running:
+ if self.mpd_active():
+ return True
+
  return False
 
  def refresh(self, source=None, cache=True):

lyrics/window.py

@@ -150,13 +150,19 @@ def set_up(self):
  self.stdscr.clear()
  curses.curs_set(0)
  self.current_pos = 0
-
+ 
  if self.player.running:
  self.update_track()
  self.set_titlebar()
  self.stdscr.refresh()
  self.scroll_pad.refresh(self.current_pos, 0, 4, 
  self.pad_offset, self.height - 2, self.width - 1)
+ elif self.player.running2:
+ self.update_track()
+ self.set_titlebar()
+ self.stdscr.refresh()
+ self.scroll_pad.refresh(self.current_pos, 0, 4, 
+ self.pad_offset, self.height - 2, self.width - 1)
  else:
  self.stdscr.addstr(0, 1, f'{self.player.player_name} is not running!')
  self.stdscr.refresh()
@@ -229,7 +235,13 @@ def main(self):
  self.stdscr.refresh()
  self.scroll_pad.refresh(self.current_pos, 0, 4, 
  self.pad_offset, self.height - 2, self.width - 1)
+ elif self.player.running2:
+ self.keys.input(self, key)
+ self.set_titlebar()
+ self.stdscr.refresh()
+ self.scroll_pad.refresh(self.current_pos, 0, 4, 
+ self.pad_offset, self.height - 2, self.width - 1)
  else:
  self.stdscr.clear()
  self.stdscr.addstr(0, 1, f'{self.player.player_name} player is not running.')
- self.stdscr.refresh()
+ self.stdscr.refresh()

setup.py

@@ -70,7 +70,8 @@ def updateConfigFile(self):
  "Operating System :: POSIX :: Linux",
  ],
  install_requires=[
- 'dbus-python'
+ 'dbus-python',
+ 'python-mpd2'
  ],
  python_requires='>=3.6',
  cmdclass={