Fix error handling

picard/acoustid/json_helpers.py

@@ -69,6 +69,7 @@ def _make_artist_credit_node(artists):
 def parse_recording(recording):
     if 'title' not in recording:  # we have no metadata for this recording
         return
+
     recording_mb = {
         'id': recording['id'],
         'title': recording['title'],

picard/album.py

@@ -182,7 +182,7 @@ def _release_request_finished(self, document, http, error):
             else:
                 try:
                     parsed = self._parse_release(document)
-                except:
+                except Exception as e:
                     error = True
                     self.error_append(traceback.format_exc())
         finally:

picard/cluster.py

@@ -168,7 +168,7 @@ def _lookup_finished(self, document, http, error):
 
         try:
             releases = document['releases']
-        except (AttributeError, IndexError):
+        except (KeyError, TypeError):
             releases = None
 
         mparms = {

picard/file.py

@@ -52,6 +52,7 @@
 from picard.const import QUERY_LIMIT
 from picard import PICARD_APP_NAME
 
+
 class File(QtCore.QObject, Item):
 
     metadata_images_changed = QtCore.pyqtSignal()
@@ -579,9 +580,8 @@ def _lookup_finished(self, lookuptype, document, http, error):
                 tracks = document['recordings']
             elif lookuptype == "acoustid":
                 tracks = document['recordings']
-        except Exception as e:
+        except (KeyError, TypeError):
             tracks = None
-            log.debug(e)
 
         # no matches
         if not tracks:
@@ -597,21 +597,21 @@ def _lookup_finished(self, lookuptype, document, http, error):
         match = sorted((self.metadata.compare_to_track(
             track, self.comparison_weights) for track in tracks),
             reverse=True, key=itemgetter(0))[0]
-        if lookuptype != 'acoustid':
-            threshold = config.setting['file_lookup_threshold']
-            if match[0] < threshold:
-                self.tagger.window.set_statusbar_message(
-                    N_("No matching tracks above the threshold for file '%(filename)s'"),
-                    {'filename': self.filename},
-                    timeout=3000
-                )
-                self.clear_pending()
-                return
+        if lookuptype != 'acoustid' and match[0] < config.setting['file_lookup_threshold']:
+            self.tagger.window.set_statusbar_message(
+                N_("No matching tracks above the threshold for file '%(filename)s'"),
+                {'filename': self.filename},
+                timeout=3000
+            )
+            self.clear_pending()
+            return
+
         self.tagger.window.set_statusbar_message(
             N_("File '%(filename)s' identified!"),
             {'filename': self.filename},
             timeout=3000
         )
+
         self.clear_pending()
 
         rg, release, track = match[1:]

picard/releasegroup.py

@@ -58,7 +58,13 @@ def _parse_versions(self, document):
             "catnum":   N_('Cat No'),
         }
         extrakeys = ("packaging", "barcode", "disambiguation")
-        for node in document['releases']:
+
+        try:
+            releases = document['releases']
+        except (TypeError, KeyError):
+            releases = []
+
+        for node in releases:
             labels, catnums = label_info_from_node(node['label-info'])
 
             countries = country_list_from_node(node)

picard/ui/searchdialog.py

@@ -378,7 +378,7 @@ def handle_reply(self, document, http, error):
 
         try:
             tracks = document['recordings']
-        except Exception:
+        except (KeyError, TypeError):
             self.no_results_found()
             return
 
@@ -393,7 +393,7 @@ def handle_reply(self, document, http, error):
             tracks = [item[3] for item in sorted_results]
 
         del self.search_results[:]  # Clear existing data
-        self.parse_tracks_from_xml(tracks)
+        self.parse_tracks(tracks)
         self.display_results()
 
     def display_results(self):
@@ -410,8 +410,8 @@ def display_results(self):
             self.table.setItem(row, 5, table_item(track.get("country", "")))
             self.table.setItem(row, 6, table_item(track.get("releasetype", "")))
 
-    def parse_tracks_from_xml(self, tracks_xml):
-        for node in tracks_xml:
+    def parse_tracks(self, tracks):
+        for node in tracks:
             if "releases" in node:
                 for rel_node in node['releases']:
                     track = Metadata()
@@ -568,12 +568,12 @@ def handle_reply(self, document, http, error):
 
         try:
             releases = document['releases']
-        except Exception:
+        except (KeyError, TypeError):
             self.no_results_found()
             return
 
         del self.search_results[:]
-        self.parse_releases_from_xml(releases)
+        self.parse_releases(releases)
         self.display_results()
         self.fetch_coverarts()
 
@@ -645,19 +645,20 @@ def _cover_downloaded(self, row, data, http, error):
             try:
                 pixmap.loadFromData(data)
                 cover_cell.update(pixmap)
-            except Exception:
+            except Exception as e:
                 cover_cell.not_found()
+                log.debug(e)
 
-    def parse_releases_from_xml(self, release_xml):
-        for node in release_xml:
+    def parse_releases(self, releases):
+        for node in releases:
             release = Metadata()
             release_to_metadata(node, release)
             rg_node = node['release-group']
             release_group_to_metadata(rg_node, release)
             if "media" in node:
                 media = node['media']
                 release["format"] = media_formats_from_node(media)
-                release["tracks"] = media[0]['track-count']
+                release["tracks"] = node['track-count']
             countries = country_list_from_node(node)
             if countries:
                 release["country"] = ", ".join(countries)
@@ -762,16 +763,16 @@ def handle_reply(self, document, http, error):
 
         try:
             artists = document['artists']
-        except Exception:
+        except (KeyError, TypeError):
             self.no_results()
             return
 
         del self.search_results[:]
-        self.parse_artists_from_xml(artists)
+        self.parse_artists(artists)
         self.display_results()
 
-    def parse_artists_from_xml(self, artist_xml):
-        for node in artist_xml:
+    def parse_artists(self, artists):
+        for node in artists:
             artist = Metadata()
             artist_to_metadata(node, artist)
             self.search_results.append(artist)

picard/webservice/api_helpers.py

@@ -134,7 +134,7 @@ def _find(self, entitytype, handler, **kwargs):
                 value = escape_lucene_query(value).strip().lower()
                 if value:
                     query.append('%s:(%s)' % (name, value))
-            query = ''.join(query)
+            query = ' '.join(query)
 
         if query:
             filters.append(("query", query))