diff options
Diffstat (limited to 'nephilim/plugins/Lyrics.py')
| -rw-r--r-- | nephilim/plugins/Lyrics.py | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/nephilim/plugins/Lyrics.py b/nephilim/plugins/Lyrics.py index 61d34f1..4413b8e 100644 --- a/nephilim/plugins/Lyrics.py +++ b/nephilim/plugins/Lyrics.py @@ -16,7 +16,6 @@ # from PyQt4 import QtGui, QtCore, QtNetwork -from PyQt4.QtCore import QVariant import os import re @@ -110,7 +109,7 @@ class Lyrics(Plugin): # private DEFAULTS = {'fetchers' : ['Lyricwiki', 'Animelyrics'], 'lyricdir' : '${musicdir}/${songdir}', - 'lyricname' : '.lyrics_%s_${artist}_${album}_${title}'%common.APPNAME, 'store' : True} + 'lyricname' : '.lyrics_%s_${artist}_${album}_${title}'%common.APPNAME, 'store' : 1} "implemented fetchers" available_fetchers = None #XXX SettingsWidget currently uses it "enabled fetchers, those with higher priority first" @@ -136,7 +135,7 @@ class Lyrics(Plugin): i = self.__fetchers.index(self.sender()) if lyrics and i < self.__index: - if self.settings.value(self.name + '/store').toBool() and self.__lyrics_path: + if int(self.settings.value(self.name + '/store')) and self.__lyrics_path: self.save_lyrics_file(lyrics) self.__index = i return self.o.set_lyrics(song, lyrics) @@ -159,17 +158,17 @@ class Lyrics(Plugin): self.store = QtGui.QGroupBox('Store lyrics.') self.store.setToolTip('Should %s store its own copy of lyrics?'%common.APPNAME) self.store.setCheckable(True) - self.store.setChecked(self.settings.value('store').toBool()) + self.store.setChecked(int(self.settings.value('store'))) self.store.setLayout(QtGui.QGridLayout()) # paths to lyrics - self.lyricdir = QtGui.QLineEdit(self.settings.value('lyricdir').toString()) + self.lyricdir = QtGui.QLineEdit(self.settings.value('lyricdir')) self.lyricdir.setToolTip('Where should %s store lyrics.\n' '${musicdir} will be expanded to path to MPD music library (as set by user)\n' '${songdir} will be expanded to path to the song (relative to ${musicdir}\n' 'other tags same as in lyricname' %common.APPNAME) - self.lyricname = QtGui.QLineEdit(self.settings.value('lyricname').toString()) + self.lyricname = QtGui.QLineEdit(self.settings.value('lyricname')) self.lyricname.setToolTip('Filename for %s lyricsfiles.\n' 'All tags supported by MPD will be expanded to their\n' 'values for current song, e.g. ${title}, ${track}, ${artist},\n' @@ -180,7 +179,7 @@ class Lyrics(Plugin): self.store.layout().addWidget(self.lyricname, 1, 1) # fetchers list - fetchers = self.settings.value('fetchers').toStringList() + fetchers = self.settings.value('fetchers') self.fetcherlist = QtGui.QListWidget(self) self.fetcherlist.setDragDropMode(QtGui.QAbstractItemView.InternalMove) for fetcher in fetchers: @@ -202,16 +201,16 @@ class Lyrics(Plugin): def save_settings(self): self.settings.beginGroup(self.plugin.name) - self.settings.setValue('lyricdir', QVariant(self.lyricdir.text())) - self.settings.setValue('lyricname', QVariant(self.lyricname.text())) - self.settings.setValue('store', QVariant(self.store.isChecked())) + self.settings.setValue('lyricdir', self.lyricdir.text()) + self.settings.setValue('lyricname', self.lyricname.text()) + self.settings.setValue('store', int(self.store.isChecked())) fetchers = [] for i in range(self.fetcherlist.count()): it = self.fetcherlist.item(i) if it.checkState() == QtCore.Qt.Checked: fetchers.append(it.text()) - self.settings.setValue('fetchers', QVariant(fetchers)) + self.settings.setValue('fetchers', fetchers) self.settings.endGroup() self.plugin.refresh_fetchers() @@ -244,8 +243,8 @@ class Lyrics(Plugin): return self.o.set_lyrics(None, None) (self.__lyrics_dir, self.__lyrics_path) = common.generate_metadata_path(song, - self.settings.value(self.name + '/lyricdir').toString(), - self.settings.value(self.name + '/lyricname').toString()) + 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) file = open(self.__lyrics_path, 'r') @@ -280,8 +279,8 @@ class Lyrics(Plugin): if not song: path = self.__lyrics_path else: - path = common.generate_metadata_path(song, self.settings.value(self.name + '/lyricdir').toString(), - self.settings.value(self.name + '/lyricname').toString()) + path = common.generate_metadata_path(song, self.settings.value(self.name + '/lyricdir'), + self.settings.value(self.name + '/lyricname')) try: os.remove(path) @@ -295,7 +294,7 @@ class Lyrics(Plugin): """Refresh the list of available fetchers.""" self.__fetchers = [] # append fetchers in order they are stored in settings - for name in self.settings.value('%s/fetchers'%self.name).toStringList(): + for name in self.settings.value('%s/fetchers'%self.name): for fetcher in self.available_fetchers: if fetcher.name == name: self.__fetchers.append(fetcher(self)) |