diff options
| author | Anton Khirnov <wyskas@gmail.com> | 2009-05-12 21:01:41 +0200 |
|---|---|---|
| committer | Anton Khirnov <wyskas@gmail.com> | 2009-05-12 21:01:41 +0200 |
| commit | 420386f8b7a209b717e64bd85718268efa88d99c (patch) | |
| tree | d252118a6783b43bdba1da0dca03e8731b4bfc89 /nephilim/plugins/Lyrics.py | |
| parent | 0064457dc61ad34a8086cf7607f261fb0946efd7 (diff) | |
Lyrics: use python, not Qt for reading lyrics file
it's nicer to use.
Diffstat (limited to 'nephilim/plugins/Lyrics.py')
| -rw-r--r-- | nephilim/plugins/Lyrics.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/nephilim/plugins/Lyrics.py b/nephilim/plugins/Lyrics.py index cc51d35..e4f053b 100644 --- a/nephilim/plugins/Lyrics.py +++ b/nephilim/plugins/Lyrics.py @@ -109,12 +109,14 @@ class Lyrics(Plugin): (self.lyrics_dir, self.lyrics_path) = misc.generate_metadata_path(self.parent(), song, self.settings().value(self.name() + '/lyricdir').toString(), self.settings().value(self.name() + '/lyricname').toString()) - file = QtCore.QFile(self.lyrics_path) - if file.open(QtCore.QIODevice.ReadOnly | QtCore.QIODevice.Text): - lyrics = file.readAll() + try: + file = open(self.lyrics_path, 'r') + lyrics = file.read().decode('utf-8') file.close() if lyrics: - return self.emit(QtCore.SIGNAL('new_lyrics_fetched'), song, QtCore.QString(lyrics)) + return self.emit(QtCore.SIGNAL('new_lyrics_fetched'), song, lyrics) + except IOError, e: + logging.info('Error reading lyrics file: %s.'%e) thread = self.FetchThread(self, self._fetch_lyrics, song) |