summaryrefslogtreecommitdiff
path: root/nephilim/plugins/Lyrics.py
diff options
context:
space:
mode:
authorAnton Khirnov <wyskas@gmail.com>2009-08-22 09:42:36 +0200
committerAnton Khirnov <wyskas@gmail.com>2009-08-22 09:42:36 +0200
commitac10c70a883e71b866a3db79b6951dc7614908a8 (patch)
tree1a7a936ebc627139ec59e7ed18d3b81ed0c6e64e /nephilim/plugins/Lyrics.py
parent1abb1624473644fa3f7fb6963882ea4b98e1bf4d (diff)
Remove second Networkreply var from MetadataFecher
it's redundant.
Diffstat (limited to 'nephilim/plugins/Lyrics.py')
-rw-r--r--nephilim/plugins/Lyrics.py26
1 files changed, 13 insertions, 13 deletions
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()