Remove second Networkreply var from MetadataFecher

it's redundant.

3 files changed, 26 insertions, 32 deletions

diff --git a/nephilim/common.py b/nephilim/common.py
index 238faa1..5c12225 100644
--- a/nephilim/common.py
+++ b/nephilim/common.py
@@ -94,8 +94,7 @@ class MetadataFetcher(QtCore.QObject):
 
     #private
     nam  = None  # NetworkAccessManager
-    srep = None  # search results NetworkReply
-    mrep = None  # metadata page NetworkReply
+    rep = None   # current NetworkReply.
     song = None  # current song
 
     # SIGNALS
@@ -115,13 +114,13 @@ class MetadataFetcher(QtCore.QObject):
         self.song = song
 
         self.logger.info('Searching %s: %s.'%(self. name, url))
-        self.srep = self.nam.get(QtNetwork.QNetworkRequest(url))
+        self.rep = self.nam.get(QtNetwork.QNetworkRequest(url))
 
     def finish(self, metadata = None):
         """A private convenience function to clean up and emit finished().
            Feel free to reimplement/not use it."""
-        self.srep = None
-        self.mrep = None
+        self.rep = None
+        self.rep = None
         self.finished.emit(self.song, metadata)
         self.song = None
 
@@ -132,12 +131,7 @@ class MetadataFetcher(QtCore.QObject):
 
     def abort(self):
         """Abort all downloads currently in progress."""
-        if self.srep:
-            self.srep.finished.disconnect()
-            self.srep.abort()
-            self.srep = None
-        if self.mrep:
-            self.mrep.finished.disconnect()
-            self.mrep.abort()
-            self.mrep = None
-
+        if self.rep:
+            self.rep.finished.disconnect()
+            self.rep.abort()
+            self.rep = None
diff --git a/nephilim/plugins/AlbumCover.py b/nephilim/plugins/AlbumCover.py
index bd54e62..737e466 100644
--- a/nephilim/plugins/AlbumCover.py
+++ b/nephilim/plugins/AlbumCover.py
@@ -222,11 +222,11 @@ class AlbumCover(Plugin):
                                ('album',   song.album()),
                                ('mbid',    song.tag('MUSICBRAINZ_ALBUMID'))])
             self.fetch2(song, url)
-            self.srep.finished.connect(self.__handle_search_res)
+            self.rep.finished.connect(self.__handle_search_res)
 
         def __handle_search_res(self):
             url = None
-            xml = QtCore.QXmlStreamReader(self.srep)
+            xml = QtCore.QXmlStreamReader(self.rep)
 
             while not xml.atEnd():
                 token = xml.readNext()
@@ -242,11 +242,11 @@ class AlbumCover(Plugin):
                 return self.finish()
             self.logger.info('Found %s song URL: %s.'%(self.name, url))
 
-            self.mrep = self.nam.get(QtNetwork.QNetworkRequest(url))
-            self.mrep.finished.connect(self.__handle_cover)
+            self.rep = self.nam.get(QtNetwork.QNetworkRequest(url))
+            self.rep.finished.connect(self.__handle_cover)
 
         def __handle_cover(self):
-            data = self.mrep.readAll()
+            data = self.rep.readAll()
             pixmap = QtGui.QPixmap()
             if pixmap.loadFromData(data):
                 self.finish(pixmap)
diff --git a/nephilim/plugins/Lyrics.py b/nephilim/plugins/Lyrics.py
index fe3e36d..c007f77 100644
--- a/nephilim/plugins/Lyrics.py
+++ b/nephilim/plugins/Lyrics.py
@@ -147,11 +147,11 @@ class Lyrics(Plugin):
             url.setQueryItems([('func', 'getArtist'), ('artist', song.artist()),
                                     ('fmt', 'xml')])
             self.fetch2(song, url)
-            self.srep.finished.connect(self.__handle_artist_res)
+            self.rep.finished.connect(self.__handle_artist_res)
 
         def __handle_artist_res(self):
             artist = None
-            xml    = QtCore.QXmlStreamReader(self.srep)
+            xml    = QtCore.QXmlStreamReader(self.rep)
             while not xml.atEnd():
                 token = xml.readNext()
                 if token == QtCore.QXmlStreamReader.StartElement:
@@ -165,12 +165,12 @@ class Lyrics(Plugin):
             url = QtCore.QUrl('http://lyricwiki.org/api.php')
             url.setQueryItems([('func', 'getSong'), ('artist', artist),
                                ('song', self.song.title()), ('fmt', 'xml')])
-            self.srep = self.nam.get(QtNetwork.QNetworkRequest(url))
-            self.srep.finished.connect(self.__handle_search_res)
+            self.rep = self.nam.get(QtNetwork.QNetworkRequest(url))
+            self.rep.finished.connect(self.__handle_search_res)
 
         def __handle_search_res(self):
             url = None
-            xml = QtCore.QXmlStreamReader(self.srep)
+            xml = QtCore.QXmlStreamReader(self.rep)
             while not xml.atEnd():
                 token = xml.readNext()
                 if token == QtCore.QXmlStreamReader.StartElement:
@@ -188,13 +188,13 @@ class Lyrics(Plugin):
                 return self.finish()
             self.logger.info('Found Lyricwiki song URL: %s.'%url)
 
-            self.mrep = self.nam.get(QtNetwork.QNetworkRequest(url))
-            self.mrep.finished.connect(self.__handle_lyrics)
+            self.rep = self.nam.get(QtNetwork.QNetworkRequest(url))
+            self.rep.finished.connect(self.__handle_lyrics)
 
         def __handle_lyrics(self):
             #TODO this should use Qt xml functions too
             lyrics = ''
-            page = unicode(self.mrep.readAll(), encoding = 'utf-8')
+            page = unicode(self.rep.readAll(), encoding = 'utf-8')
             page = re.sub('<br>|<br/>|<br />', '\n', page)
             try:
                 html   = etree.HTML(page)
@@ -214,12 +214,12 @@ class Lyrics(Plugin):
             url = QtCore.QUrl('http://www.animelyrics.com/search.php')
             url.setQueryItems([('t', 'performer'), ('q', song.artist())])
             self.fetch2(song, url)
-            self.srep.finished.connect(self.__handle_search_res)
+            self.rep.finished.connect(self.__handle_search_res)
 
         def __handle_search_res(self):
             # TODO use Qt xml functions
             try:
-                tree = etree.HTML(unicode(self.srep.readAll(), encoding = 'utf-8', errors='ignore'))
+                tree = etree.HTML(unicode(self.rep.readAll(), encoding = 'utf-8', errors='ignore'))
             except etree.XMLSyntaxError, e:
                 self.logger.error('Error parsing lyrics: %s' %e)
                 return self.finish()
@@ -234,13 +234,13 @@ class Lyrics(Plugin):
                 return self.finish()
             self.logger.info('Found Animelyrics song URL: %s.'%url)
 
-            self.mrep = self.nam.get(QtNetwork.QNetworkRequest(url))
-            self.mrep.finished.connect(self.__handle_lyrics)
+            self.rep = self.nam.get(QtNetwork.QNetworkRequest(url))
+            self.rep.finished.connect(self.__handle_lyrics)
 
         def __handle_lyrics(self):
             lyrics = ''
             try:
-                tree   = etree.HTML(unicode(self.mrep.readAll(), encoding = 'utf-8'))
+                tree   = etree.HTML(unicode(self.rep.readAll(), encoding = 'utf-8'))
             except etree.XMLSyntaxError, e:
                 self.logger.error('Error parsing lyrics: %s' %e)
                 return self.finish()