Remove unneeded wrapper methods

picard/coverart.py

@@ -158,7 +158,7 @@ class CoverArt:
             echo=None
         )
         log.debug("Downloading %r" % coverartimage)
-        self.xmlws_download(
+        self.album.tagger.xmlws.download(
             coverartimage.host,
             coverartimage.port,
             coverartimage.path,
@@ -166,6 +166,7 @@ class CoverArt:
             priority=True,
             important=False
         )
+        self.album._requests += 1
 
     def queue_put(self, coverartimage):
         "Add an image to queue"
@@ -188,11 +189,6 @@ class CoverArt:
         """Display message to status bar"""
         QObject.tagger.window.set_statusbar_message(*args, **kwargs)
 
-    def xmlws_download(self, *args, **kwargs):
-        """xmlws.download wrapper"""
-        self.album._requests += 1
-        self.album.tagger.xmlws.download(*args, **kwargs)
-
 
 def coverart(album, metadata, release):
     """Gets all cover art URLs from the metadata and then attempts to

picard/coverartproviders/__init__.py

@@ -49,7 +49,6 @@ class CoverArtProvider:
         self.release = coverart.release
         self.metadata = coverart.metadata
         self.album = coverart.album
-        self.xmlws_download = coverart.xmlws_download
 
     def enabled(self):
         return True
@@ -57,12 +56,6 @@ class CoverArtProvider:
     def queue_downloads(self):
         raise NotImplementedError
 
-    def requests_count_increment(self):
-        self.coverart.album._requests += 1
-
-    def requests_count_decrement(self):
-        self.coverart.album._requests -= 1
-
     def error(self, msg):
         self.coverart.album.error_append(msg)
 

picard/coverartproviders/caa.py

@@ -105,7 +105,7 @@ class CoverArtProviderCaa(CoverArtProvider):
         return caa_has_suitable_artwork
 
     def queue_downloads(self):
-        self.xmlws_download(
+        self.album.tagger.xmlws.download(
             CAA_HOST,
             CAA_PORT,
             "/release/%s/" % self.metadata["musicbrainz_albumid"],
@@ -113,12 +113,13 @@ class CoverArtProviderCaa(CoverArtProvider):
             priority=True,
             important=False
         )
+        self.album._requests += 1
         # we will call next_in_queue() after json parsing
         return CoverArtProvider.WAIT
 
     def _caa_json_downloaded(self, data, http, error):
         """Parse CAA JSON file and queue CAA cover art images for download"""
-        self.requests_count_decrement()
+        self.album._requests -= 1
         if error:
             self.error(u'CAA JSON error: %s' % (unicode(http.errorString())))
         else: