diff options
Diffstat (limited to 'nephilim/common.py')
| -rw-r--r-- | nephilim/common.py | 22 |
1 files changed, 8 insertions, 14 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 |