summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nephilim/misc.py3
-rw-r--r--nephilim/nephilim_app.py6
-rw-r--r--nephilim/plugin.py17
-rw-r--r--nephilim/plugins/AlbumCover.py12
-rw-r--r--nephilim/plugins/Library.py6
-rw-r--r--nephilim/plugins/Lyrics.py10
-rw-r--r--nephilim/plugins/Notify.py14
-rw-r--r--nephilim/plugins/PlayControl.py4
-rw-r--r--nephilim/plugins/Playlist.py8
-rw-r--r--nephilim/plugins/Systray.py6
-rw-r--r--nephilim/settings_wg.py4
11 files changed, 44 insertions, 46 deletions
diff --git a/nephilim/misc.py b/nephilim/misc.py
index f7dd2a0..2a2cb35 100644
--- a/nephilim/misc.py
+++ b/nephilim/misc.py
@@ -71,8 +71,7 @@ def expand_tags(str, expanders):
def generate_metadata_path(song, dir_tag, file_tag):
"""Generate dirname and (db files only) full file path for reading/writing metadata files
- (cover, lyrics) from $tags in dir/filename.
- HACK main_win argument should be removed ASAP"""
+ (cover, lyrics) from $tags in dir/filename."""
if QtCore.QDir.isAbsolutePath(song.filepath()):
dirname = os.path.dirname(song.filepath())
filepath = ''
diff --git a/nephilim/nephilim_app.py b/nephilim/nephilim_app.py
index 269cc9e..b3f00be 100644
--- a/nephilim/nephilim_app.py
+++ b/nephilim/nephilim_app.py
@@ -59,10 +59,10 @@ class NephilimApp(QtGui.QApplication):
show_settings = False # are there new plugins?
self.plugins = plugins.Plugins(self.main_win, self.mpclient)
for plugin in self.plugins.plugins():
- if self.settings.value(plugin.name() + '/load') == None:
+ if self.settings.value(plugin.name + '/load') == None:
show_settings = True
- if self.settings.value(plugin.name() + '/load', QtCore.QVariant(True)).toBool():
- self.plugins.load(plugin.name())
+ if self.settings.value(plugin.name + '/load', QtCore.QVariant(True)).toBool():
+ self.plugins.load(plugin.name)
self.connect(self, QtCore.SIGNAL('aboutToQuit()'), self.__cleanup)
diff --git a/nephilim/plugin.py b/nephilim/plugin.py
index 539cd5d..b443167 100644
--- a/nephilim/plugin.py
+++ b/nephilim/plugin.py
@@ -23,7 +23,10 @@ import logging
import plugins
class Plugin(QtCore.QObject):
- _name = None
+ # public, const
+ name = None
+ logger = None
+
_dock_widget = None
_settings = None
_loaded = None
@@ -31,18 +34,17 @@ class Plugin(QtCore.QObject):
_mpclient = None
o = None
- logger = None
DEFAULTS = {}
def __init__(self, parent, mpclient, name):
QtCore.QObject.__init__(self)
- self._name = name
+ self.name = name
self._parent = parent
self._mpclient = mpclient
self._loaded = False
self._settings = QtCore.QSettings()
- self.logger = logging.getLogger(self.name())
+ self.logger = logging.getLogger(self.name)
#init settings
self.logger.debug('Initializing default settings.')
@@ -52,9 +54,6 @@ class Plugin(QtCore.QObject):
self._settings.setValue(key, QVariant(self.DEFAULTS[key]))
self._settings.endGroup()
-
- def name(self):
- return self._name
def info(self):
return ''
def parent(self):
@@ -135,8 +134,8 @@ class Plugin(QtCore.QObject):
return None
def _create_dock(self, widget):
"""Creates a QDockWidget with _parent $_parent containing widget $widget."""
- dock=QtGui.QDockWidget(self._name, QtGui.QApplication.instance().main_win)
- dock.setObjectName(self._name)
+ dock=QtGui.QDockWidget(self.name, QtGui.QApplication.instance().main_win)
+ dock.setObjectName(self.name)
dock.setWidget(widget)
return dock
diff --git a/nephilim/plugins/AlbumCover.py b/nephilim/plugins/AlbumCover.py
index a62a701..e9d3f60 100644
--- a/nephilim/plugins/AlbumCover.py
+++ b/nephilim/plugins/AlbumCover.py
@@ -103,7 +103,7 @@ class wgAlbumCover(QtGui.QLabel):
self.plugin.emit(QtCore.SIGNAL('cover_changed'), self.cover)
self.logger.info('Cover set.')
- if (write and self.plugin.settings().value(self.plugin.name() + '/store').toBool()
+ if (write and self.plugin.settings().value(self.plugin.name + '/store').toBool()
and self._cover_filepath):
if self.cover.save(self._cover_filepath, 'png'):
self.logger.info('Cover saved.')
@@ -134,13 +134,13 @@ class wgAlbumCover(QtGui.QLabel):
self.logger.info("autorefreshing cover")
# generate filenames
- (self._cover_dirname, self._cover_filepath) = generate_metadata_path(song, self.plugin.settings().value(self.plugin.name() + '/coverdir').toString(),
- self.plugin.settings().value(self.plugin.name() + '/covername').toString())
+ (self._cover_dirname, self._cover_filepath) = generate_metadata_path(song, self.plugin.settings().value(self.plugin.name + '/coverdir').toString(),
+ self.plugin.settings().value(self.plugin.name + '/covername').toString())
write = False
if not QtCore.QFile.exists(self._cover_filepath):
for i in (0, 1):
- src = self.plugin.settings().value(self.plugin.name() + '/method%i'%i).toInt()[0]
+ src = self.plugin.settings().value(self.plugin.name + '/method%i'%i).toInt()[0]
if src == AC_FETCH_LOCAL_DIR and self._cover_dirname:
cover = self._fetch_local(song)
elif src == AC_FETCH_AMAZON:
@@ -274,7 +274,7 @@ class AlbumCover(Plugin):
def __init__(self, plugin):
Plugin.SettingsWidget.__init__(self, plugin)
- self.settings().beginGroup(self.plugin.name())
+ self.settings().beginGroup(self.plugin.name)
# fetching methods comboboxes
self.methods = [QtGui.QComboBox(), QtGui.QComboBox()]
@@ -316,7 +316,7 @@ class AlbumCover(Plugin):
self.settings().endGroup()
def save_settings(self):
- self.settings().beginGroup(self.plugin.name())
+ self.settings().beginGroup(self.plugin.name)
self.settings().setValue('method0', QVariant(self.methods[0].currentIndex()))
self.settings().setValue('method1', QVariant(self.methods[1].currentIndex()))
self.settings().setValue('coverdir', QVariant(self.coverdir.text()))
diff --git a/nephilim/plugins/Library.py b/nephilim/plugins/Library.py
index 391c7a1..6fa0c92 100644
--- a/nephilim/plugins/Library.py
+++ b/nephilim/plugins/Library.py
@@ -53,7 +53,7 @@ class Library(Plugin):
self.modes = QtGui.QComboBox()
self.modes.setEditable(True)
- for mode in self.settings().value(self.plugin.name() + '/modes').toStringList():
+ for mode in self.settings().value(self.plugin.name + '/modes').toStringList():
self.modes.addItem(mode)
self._add_widget(self.modes, 'Modes', 'How should the songs in library be grouped.\n'
'Should be written in form tag1/tag2/...,\n'
@@ -63,7 +63,7 @@ class Library(Plugin):
modes = []
for i in range(0, self.modes.count()):
modes.append(self.modes.itemText(i))
- self.settings().setValue(self.plugin.name() + '/modes', QVariant(modes))
+ self.settings().setValue(self.plugin.name + '/modes', QVariant(modes))
self.plugin.o.refresh_modes()
def get_settings_widget(self):
@@ -130,7 +130,7 @@ class LibraryWidget(QtGui.QWidget):
self.plugin = plugin
self.logger = plugin.logger
self.settings = QtCore.QSettings()
- self.settings.beginGroup(self.plugin.name())
+ self.settings.beginGroup(self.plugin.name)
self.modes = QtGui.QComboBox()
self.refresh_modes()
diff --git a/nephilim/plugins/Lyrics.py b/nephilim/plugins/Lyrics.py
index 02d6a3c..b49e18c 100644
--- a/nephilim/plugins/Lyrics.py
+++ b/nephilim/plugins/Lyrics.py
@@ -82,7 +82,7 @@ class Lyrics(Plugin):
def _load(self):
self.o = wgLyrics(self)
for site in _available_sites:
- if site in self.settings().value('%s/sites'%self.name()).toStringList():
+ if site in self.settings().value('%s/sites'%self.name).toStringList():
self.sites.append(site)
self.connect(self.mpclient(), QtCore.SIGNAL('song_changed'), self.refresh)
def _unload(self):
@@ -111,8 +111,8 @@ class Lyrics(Plugin):
return self.o.set_lyrics(None, None)
(self.lyrics_dir, self.lyrics_path) = misc.generate_metadata_path(song,
- self.settings().value(self.name() + '/lyricdir').toString(),
- self.settings().value(self.name() + '/lyricname').toString())
+ self.settings().value(self.name + '/lyricdir').toString(),
+ self.settings().value(self.name + '/lyricname').toString())
try:
self.logger.info('Trying to read lyrics from file %s.'%self.lyrics_path)
file = open(self.lyrics_path, 'r')
@@ -164,7 +164,7 @@ class Lyrics(Plugin):
def __init__(self, plugin):
Plugin.SettingsWidget.__init__(self, plugin)
- self.settings().beginGroup(self.plugin.name())
+ self.settings().beginGroup(self.plugin.name)
# store lyrics groupbox
@@ -197,7 +197,7 @@ class Lyrics(Plugin):
self.settings().endGroup()
def save_settings(self):
- self.settings().beginGroup(self.plugin.name())
+ 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()))
diff --git a/nephilim/plugins/Notify.py b/nephilim/plugins/Notify.py
index d9e2a24..4192d67 100644
--- a/nephilim/plugins/Notify.py
+++ b/nephilim/plugins/Notify.py
@@ -126,22 +126,22 @@ class Notify(Plugin):
song = self.mpclient().current_song()
if not song:
return
- self.settings().beginGroup(self.name())
+ self.settings().beginGroup(self.name)
self.o.show(expand_tags(self.settings().value('songformat').toString(), (song,)), self.settings().value('timer').toInt()[0],
NOTIFY_PRIORITY_SONG)
self.settings().endGroup()
def onConnected(self):
- self.o.show('%s loaded'%APPNAME, self.settings().value(self.name() + '/timer').toInt()[0])
+ self.o.show('%s loaded'%APPNAME, self.settings().value(self.name + '/timer').toInt()[0])
def onDisconnect(self):
- self.o.show('Disconnected!', self.settings().value(self.name() + '/timer').toInt()[0])
+ self.o.show('Disconnected!', self.settings().value(self.name + '/timer').toInt()[0])
def onStateChange(self, new_state):
- self.o.show(new_state, self.settings().value(self.name() + '/timer').toInt()[0])
+ self.o.show(new_state, self.settings().value(self.name + '/timer').toInt()[0])
def onVolumeChange(self, new_vol):
- self.o.show('Volume: %i%%'%(new_vol), self.settings().value(self.name() + '/timer').toInt()[0], priority = NOTIFY_PRIORITY_VOLUME)
+ self.o.show('Volume: %i%%'%(new_vol), self.settings().value(self.name + '/timer').toInt()[0], priority = NOTIFY_PRIORITY_VOLUME)
class SettingsWidgetNotify(Plugin.SettingsWidget):
format = None
@@ -149,7 +149,7 @@ class Notify(Plugin):
def __init__(self, plugin):
Plugin.SettingsWidget.__init__(self, plugin)
- self.settings().beginGroup(self.plugin.name())
+ self.settings().beginGroup(self.plugin.name)
self.format = QtGui.QLineEdit(self.settings().value('songformat').toString())
@@ -164,7 +164,7 @@ class Notify(Plugin):
self.settings().endGroup()
def save_settings(self):
- self.settings().beginGroup(self.plugin.name())
+ self.settings().beginGroup(self.plugin.name)
self.settings().setValue('songformat', QVariant(self.format.text()))
self.settings().setValue('timer', QVariant(self.timer.text().toInt()[0]))
self.settings().endGroup()
diff --git a/nephilim/plugins/PlayControl.py b/nephilim/plugins/PlayControl.py
index 8b05e82..a809a3a 100644
--- a/nephilim/plugins/PlayControl.py
+++ b/nephilim/plugins/PlayControl.py
@@ -60,11 +60,11 @@ class wgPlayControl(QtGui.QToolBar):
painter.fillRect(rect, QtGui.QBrush(grad))
def __init__(self, p, parent = None):
- QtGui.QToolBar.__init__(self, p.name(), parent)
+ QtGui.QToolBar.__init__(self, p.name, parent)
self.setMovable(True)
self.p = p
self.logger = p.logger
- self.setObjectName(p.name())
+ self.setObjectName(p.name)
self.play_icon = QtGui.QIcon('gfx/media-playback-start.svg')
self.pause_icon = QtGui.QIcon('gfx/media-playback-pause.svg')
diff --git a/nephilim/plugins/Playlist.py b/nephilim/plugins/Playlist.py
index 516f20e..f9b1a54 100644
--- a/nephilim/plugins/Playlist.py
+++ b/nephilim/plugins/Playlist.py
@@ -63,10 +63,10 @@ class PlaylistWidget(QtGui.QWidget):
self.setSelectionMode(QtGui.QTreeWidget.ExtendedSelection)
self.setAlternatingRowColors(True)
self.setRootIsDecorated(False)
- columns = self.plugin.settings().value(self.plugin.name() + '/columns').toStringList()
+ columns = self.plugin.settings().value(self.plugin.name + '/columns').toStringList()
self.setColumnCount(len(columns))
self.setHeaderLabels(columns)
- self.header().restoreState(self.plugin.settings().value(self.plugin.name() + '/header_state').toByteArray())
+ self.header().restoreState(self.plugin.settings().value(self.plugin.name + '/header_state').toByteArray())
self.connect(self, QtCore.SIGNAL('itemActivated(QTreeWidgetItem*, int)'), self._song_activated)
self.connect(self.header(), QtCore.SIGNAL('geometriesChanged()'), self._save_state)
@@ -74,13 +74,13 @@ class PlaylistWidget(QtGui.QWidget):
self.connect(self.plugin.mpclient(), QtCore.SIGNAL('disconnected'), self.fill)
def _save_state(self):
- self.plugin.settings().setValue(self.plugin.name() + '/header_state', QVariant(self.header().saveState()))
+ self.plugin.settings().setValue(self.plugin.name + '/header_state', QVariant(self.header().saveState()))
def _song_activated(self, item):
self.plugin.mpclient().play(item.data(0, QtCore.Qt.UserRole).toPyObject().id())
def fill(self):
- columns = self.plugin.settings().value(self.plugin.name() + '/columns').toStringList()
+ columns = self.plugin.settings().value(self.plugin.name + '/columns').toStringList()
self.clear()
for song in self.plugin.mpclient().playlist():
item = QtGui.QTreeWidgetItem()
diff --git a/nephilim/plugins/Systray.py b/nephilim/plugins/Systray.py
index 90a64b5..2dc16f8 100644
--- a/nephilim/plugins/Systray.py
+++ b/nephilim/plugins/Systray.py
@@ -29,7 +29,7 @@ class Systray(Plugin):
DEFAULTS = {'format': '$track - $title by $artist on $album ($length)'}
def _load(self):
- self.format = self.settings().value(self.name() + '/format').toString()
+ self.format = self.settings().value(self.name + '/format').toString()
class SystrayWheelEventObject(QtCore.QObject):
"""This class listens for systray-wheel events"""
def eventFilter(self, object, event):
@@ -98,13 +98,13 @@ class Systray(Plugin):
def __init__(self, plugin):
Plugin.SettingsWidget.__init__(self, plugin)
- self.format = QtGui.QLineEdit(self.settings().value(self.plugin.name() + '/format').toString())
+ self.format = QtGui.QLineEdit(self.settings().value(self.plugin.name + '/format').toString())
self.setLayout(QtGui.QVBoxLayout())
self._add_widget(self.format, 'Tooltip format')
def save_settings(self):
- self.settings().beginGroup(self.plugin.name())
+ self.settings().beginGroup(self.plugin.name)
self.settings().setValue('format', QVariant(self.format.text()))
self.settings().endGroup()
diff --git a/nephilim/settings_wg.py b/nephilim/settings_wg.py
index 8886144..2f65bc5 100644
--- a/nephilim/settings_wg.py
+++ b/nephilim/settings_wg.py
@@ -139,7 +139,7 @@ class SettingsWidget(QtGui.QWidget):
wg = plugin.get_settings_widget()
if wg:
self.settings_wg.append(wg)
- tab_wg.addTab(self.settings_wg[-1], plugin.name())
+ tab_wg.addTab(self.settings_wg[-1], plugin.name)
self.setLayout(QtGui.QGridLayout())
self.layout().addWidget(tab_wg, 0, 0, 1, 2)
@@ -156,7 +156,7 @@ class SettingsWidget(QtGui.QWidget):
def fill_pluginlist(self):
self.pluginlist.clear()
for plugin in self.plugins.plugins():
- item = QtGui.QListWidgetItem("%s\t%s"%(plugin.name(), plugin.info()))
+ item = QtGui.QListWidgetItem("%s\t%s"%(plugin.name, plugin.info()))
if plugin.is_loaded():
item.setCheckState(QtCore.Qt.Checked)
else:
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-02 01:06:06 +0000