improve missing cover handling

Author: mueslo

pythonbits/bb.py

@@ -1061,15 +1061,22 @@ def _render_summary(self):
             'tags': [t['name'] for t in
                      sorted(rg.get('tag-list', []),
                             key=lambda t: int(t['count']))][-5:],
-            'media': [m.get('format', 'CD') for m in release['medium-list']],
-            'cover': mb.get_artwork(rg['id']),
+            'media': ([m.get('format', 'CD') for m in release['medium-list']]
+                      if release else None),
             }
 
     @finalize
     @form_field('image')
     def _render_cover(self):
-        cover = self['summary']['cover']
-        assert cover is not None
+        release, rg = self['release']
+        cover = None
+        if release:
+            cover = mb.get_release_cover(release['id'])
+        cover = cover or mb.get_release_group_cover(rg['id'])
+
+        if cover is None:
+            cover = input('No cover art found, please manually type cover '
+                          'location: ')
         return cover
 
     def _finalize_cover(self):

pythonbits/musicbrainz.py

@@ -8,7 +8,7 @@
 musicbrainzngs.set_useragent(appname, version, github)
 
 
-def get_artwork(release_group_id):
+def get_release_group_cover(release_group_id):
     try:
         data = musicbrainzngs.get_release_group_image_list(release_group_id)
     except musicbrainzngs.musicbrainz.ResponseError:
@@ -19,6 +19,17 @@ def get_artwork(release_group_id):
             return image["thumbnails"]["large"]
 
 
+def get_release_cover(release_id):
+    try:
+        data = musicbrainzngs.get_image_list(release_id)
+    except musicbrainzngs.musicbrainz.ResponseError:
+        return None
+
+    for image in data["images"]:
+        if "Front" in image["types"] and image["approved"]:
+            return image["thumbnails"]["large"]
+
+
 def find_release_group(release_title, artist=None):
     results = musicbrainzngs.search_release_groups(
         release_title, artist=artist, limit=10)['release-group-list']
@@ -74,7 +85,7 @@ def find_release(release_title, artist=None):
     print(terminaltables.SingleTable(table_data).table)
     while True:
         choice = input(
-            "Select the exact release, if known: ")
+            "Select the exact release, if known (Enter to skip): ")
         try:
             choice = results[int(choice)]
         except (IndexError, ValueError):