diff options
Diffstat (limited to 'nephilim/plugins/AlbumCover.py')
| -rw-r--r-- | nephilim/plugins/AlbumCover.py | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/nephilim/plugins/AlbumCover.py b/nephilim/plugins/AlbumCover.py index 9d4cf38..01d0182 100644 --- a/nephilim/plugins/AlbumCover.py +++ b/nephilim/plugins/AlbumCover.py @@ -16,7 +16,6 @@ # from PyQt4 import QtGui, QtCore, QtNetwork -from PyQt4.QtCore import QVariant import os @@ -103,7 +102,7 @@ class AlbumCover(Plugin): # private DEFAULTS = {'coverdir' : '${musicdir}/${songdir}', 'covername' : '.cover_%s_${artist}_${album}'%common.APPNAME, - 'fetchers': ['local', 'Last.fm'], 'store' : True} + 'fetchers': ['local', 'Last.fm'], 'store' : 1} "implemented fetchers" available_fetchers = None "enabled fetchers, those with higher priority first" @@ -132,7 +131,7 @@ class AlbumCover(Plugin): i = self.__fetchers.index(self.sender()) if cover and i < self.__index: - if self.settings.value(self.name + '/store').toBool(): + if self.settings.value(int(self.name + '/store')): self.save_cover_file(cover) self.__index = i return self.o.set_cover(song, cover) @@ -158,17 +157,17 @@ class AlbumCover(Plugin): self.store = QtGui.QGroupBox('Store covers.') self.store.setToolTip('Should %s store its own copy of covers?'%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 covers - self.coverdir = QtGui.QLineEdit(self.settings.value('coverdir').toString()) + self.coverdir = QtGui.QLineEdit(self.settings.value('coverdir')) self.coverdir.setToolTip('Where should %s store covers.\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 covername' %common.APPNAME) - self.covername = QtGui.QLineEdit(self.settings.value('covername').toString()) + self.covername = QtGui.QLineEdit(self.settings.value('covername')) self.covername.setToolTip('Filename for %s cover files.\n' 'All tags supported by MPD will be expanded to their\n' 'values for current song, e.g. ${title}, ${track}, ${artist},\n' @@ -179,7 +178,7 @@ class AlbumCover(Plugin): self.store.layout().addWidget(self.covername, 1, 1) # sites list - fetchers = self.settings.value('fetchers').toStringList() + fetchers = self.settings.value('fetchers') self.fetcherlist = QtGui.QListWidget(self) self.fetcherlist.setDragDropMode(QtGui.QAbstractItemView.InternalMove) for site in fetchers: @@ -201,16 +200,16 @@ class AlbumCover(Plugin): def save_settings(self): self.settings.beginGroup(self.plugin.name) - self.settings.setValue('coverdir', QVariant(self.coverdir.text())) - self.settings.setValue('covername', QVariant(self.covername.text())) - self.settings.setValue('store', QVariant(self.store.isChecked())) + self.settings.setValue('coverdir', self.coverdir.text()) + self.settings.setValue('covername', self.covername.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() self.plugin.refresh() @@ -237,8 +236,8 @@ class AlbumCover(Plugin): return self.o.set_cover(None, None) (self.__cover_dir, self.__cover_path) = common.generate_metadata_path(song, - self.settings.value(self.name + '/coverdir').toString(), - self.settings.value(self.name + '/covername').toString()) + self.settings.value(self.name + '/coverdir'), + self.settings.value(self.name + '/covername')) try: self.logger.info('Trying to read cover from file %s.'%self.__cover_path) cover = QtGui.QPixmap(self.__cover_path) @@ -254,7 +253,7 @@ class AlbumCover(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 site in self.available_fetchers: if site.name == name: self.__fetchers.append(site(self)) @@ -278,8 +277,8 @@ class AlbumCover(Plugin): if not song: path = self.__cover_path else: - path = common.generate_metadata_path(song, self.settings.value(self.name + '/coverdir').toString(), - self.settings.value(self.name + '/covername').toString()) + path = common.generate_metadata_path(song, self.settings.value(self.name + '/coverdir'), + self.settings.value(self.name + '/covername')) if not QtCore.QFile.remove(path): self.logger.error('Error removing file %s.'%path) @@ -301,7 +300,7 @@ class AlbumCover(Plugin): self.logger.error('Error opening cover file.') return - if self.settings.value(self.name + '/store').toBool(): + if int(self.settings.value(self.name + '/store')): self.save_cover_file(cover) self.o.set_cover(song, cover) |