Merge branch 'spotify-fix'

critiquebrainz/cache.py

@@ -106,7 +106,7 @@ def get_multi(keys, namespace=None):
         A dictionary of key/value pairs that were available. If key_prefix was
         provided, the keys in the returned dictionary will not have it present.
     """
-    if _mc is None: return
+    if _mc is None: return {}
     return _mc.get_multi(_prep_list(keys, namespace), _glob_namespace)
 
 

critiquebrainz/frontend/templates/mapping/list.html

@@ -42,7 +42,10 @@ <h3>{{ _('Spotify mappings') }}</h3>
         <tbody>
         {% for mbid, album in spotify_albums.iteritems() %}
           <tr>
-            <td><img src="{{ album.images[-1].url }}" style="max-height: 25px;" /></td>
+            <td>
+              <img src="{{ album.images[-1].url if album.images else '/static/img/missing-art.png' }}"
+                   style="max-height: 25px;" />
+            </td>
             <td>{{ album.type }}</td>
             <td><a href="{{ album.external_urls.spotify }}">{{ album.id }}</a></td>
             <td>{{ album.name }}</td>

critiquebrainz/frontend/templates/mapping/spotify.html

@@ -21,7 +21,7 @@ <h2>{{ _('Spotify album mapping') }}</h2>
       <div class="thumbnail">
         <div class="cover-art-container">
           <a href="{{ url_for('mapping.spotify_confirm', release_group_id=release_group.id, spotify_ref=item.uri) }}" class="match-link" data-toggle="tooltip" data-placement="bottom" title="This is the same album!" rel="nofollow">
-            {% if item.images[0] %}
+            {% if item.images %}
               <img class="img-responsive" src="{{ item.images[0].url }}" />
             {% else %}
               <img class="img-responsive" src="/static/img/missing-art.png" />