From dd39268468fbd3d634754054e57dc099cf168365 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 28 Nov 2010 17:23:33 +0100 Subject: Lyrics: read lyrics from stickers. --- nephilim/plugins/Lyrics.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nephilim/plugins/Lyrics.py b/nephilim/plugins/Lyrics.py index 6838eda..7f5dd2a 100644 --- a/nephilim/plugins/Lyrics.py +++ b/nephilim/plugins/Lyrics.py @@ -242,11 +242,20 @@ class Lyrics(Plugin): self.__lyrics_path = '' return self.o.set_lyrics(None, None) + self.logger.info('Trying to read lyrics from stickers.') + self.mpclient.sticker_get(song['file'], 'lyrics', callback = lambda lyrics: self._refresh2(song, lyrics)) + + def _refresh2(self, song, lyrics): + if lyrics: + lyrics = lyrics.replace('\\n', '\n') + self.logger.info('Found the lyrics sticker.') + return self.o.set_lyrics(song, lyrics) + (self.__lyrics_dir, self.__lyrics_path) = common.generate_metadata_path(song, self.settings.value(self.name + '/lyricdir'), self.settings.value(self.name + '/lyricname')) try: - self.logger.info('Trying to read lyrics from file %s.'%self.__lyrics_path) + self.logger.info('Nothing in the sticker database. Trying to read lyrics from file %s.'%self.__lyrics_path) file = open(self.__lyrics_path, 'r') lyrics = file.read().decode('utf-8') file.close() -- cgit v1.2.3