Add ability to view and play album tracks

Author: valrus

src/actions/play.py

@@ -7,34 +7,35 @@
 import sys
 
 from mpd import MPDClient
+from util import open_mpd_client
 
 
 def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('data')
-    args = parser.parse_args()
-
-    data = json.loads(args.data)
-    album, artist = data['album'], data.get('artist', '')
-
-    client = MPDClient()
-    client.connect(os.getenv('MPD_HOST', 'localhost'), int(os.getenv('MPD_PORT', '6600')))
-    client.clear()
-    vars = {}
-    if artist:
-        client.findadd('album', album, 'artist', artist)
-        vars['artist'] = artist
-    else:
-        client.findadd('album', album)
-    print(json.dumps({
-        "alfredworkflow": {
-            "arg": album,
-            "variables": vars
-        }
-    }))
-    client.play()
-    client.close()
+    with open_mpd_client() as client:
+        client.clear()
+        variables = {}
+        album = os.environ['ALFRED_MPD_ALBUM']
+        query_args = ['album', album]
+
+        artist = os.environ.get('ALFRED_MPD_ARTIST')
+        if artist:
+            query_args += ['artist', artist]
+            variables['artist'] = artist
+
+        track = os.environ.get('ALFRED_MPD_TRACK')
+        if track:
+            query_args += ['title', track]
+            variables['track'] = track
+
+        client.findadd(*query_args)
+        print(json.dumps({
+            "alfredworkflow": {
+                "arg": track or album,
+                "variables": variables
+            }
+        }))
+        client.play()
 
 
 if __name__ == '__main__':
-    main()
+    main()

src/filters/album.py

@@ -6,10 +6,7 @@
 import os
 import sys
 
-from mpd import MPDClient
-
-MPC_HOST = 'localhost'
-MPC_PORT = 6600
+from util import open_mpd_client
 
 
 def make_item(album_name, artist_name):
@@ -18,8 +15,13 @@ def make_item(album_name, artist_name):
         subtitle=artist_name,
         valid=True,
         arg=json.dumps({
-            'album': album_name,
-            'artist': artist_name,
+            'alfredworkflow': {
+                'arg': album_name,
+                'variables': {
+                    'ALFRED_MPD_ALBUM': album_name,
+                    'ALFRED_MPD_ARTIST': artist_name,
+                }
+            }
         }),
         icon='icon.png',
         autocomplete=album_name,
@@ -31,17 +33,15 @@ def make_item(album_name, artist_name):
 
 
 def main():
-    client = MPDClient()
-    client.connect(os.getenv('MPD_HOST', 'localhost'), int(os.getenv('MPD_PORT', '6600')))
-    artists = set(client.list('albumartist')) | set(client.list('artist'))
-    print(json.dumps({
-        'items': list(itertools.chain.from_iterable([
-            make_item(album, artist)
-            for album in client.list('album', 'artist', artist)
-        ]
-        for artist in client.list('albumartist'))
-    )}))
-    client.close()
+    with open_mpd_client() as client:
+        # artists = set(client.list('albumartist')) | set(client.list('artist'))
+        print(json.dumps({
+            'items': list(itertools.chain.from_iterable([
+                make_item(album, artist)
+                for album in client.list('album', 'artist', artist)
+            ]
+            for artist in client.list('albumartist'))
+        )}))
 
 
 if __name__ == '__main__':

src/filters/query.py

@@ -0,0 +1,60 @@
+from __future__ import unicode_literals
+from __future__ import print_function
+
+import argparse
+import json
+import os
+import sys
+
+from util import open_mpd_client
+
+
+def make_item(track_title, track_length, album_name, artist_name):
+    playtime = '{:01}:{:02}'.format(*divmod(track_length, 60))
+    return dict(
+        title=track_title,
+        subtitle=playtime,
+        valid=True,
+        arg=json.dumps({
+            'alfredworkflow': {
+                'arg': track_title,
+                'variables': {
+                    'ALFRED_MPD_TRACK': track_title,
+                }
+            }
+        }),
+        icon='icon.png',
+        autocomplete=track_title,
+        text={
+            'copy': track_title,
+            'largetype': track_title
+        }
+    )
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('query', nargs='+')
+    args = parser.parse_args()
+
+    query_args = args.query
+
+    with open_mpd_client() as client:
+        client.clear()
+        album = os.environ['ALFRED_MPD_ALBUM']
+        query_args = ['album', album]
+
+        artist = os.environ.get('ALFRED_MPD_ARTIST')
+        if artist:
+            query_args += ['artist', artist]
+
+        print(json.dumps({
+            'items': [
+                make_item(item['title'], int(item['time']), item.get('album'), item.get('artist'))
+                for item in client.find(*query_args)
+            ]
+        }))
+
+
+if __name__ == '__main__':
+    sys.exit(main())

src/packager.json

@@ -5,7 +5,8 @@
       "mpd_logo.png",
       "resources/*",
       "filters/*",
+      "actions/*",
       "mpd.py",
-      "actions/*"
+      "util.py"
   ]
 }

src/util.py

@@ -0,0 +1,14 @@
+from contextlib import contextmanager
+import os
+
+from mpd import MPDClient
+
+
+@contextmanager
+def open_mpd_client(host=None, port=None):
+    client = MPDClient()
+    client.connect(host or os.getenv('MPD_HOST', 'localhost'),
+                   port or int(os.getenv('MPD_PORT', '6600')))
+    yield client
+    client.close()
+    client.disconnect()