plugin: make settings a var, not a function.

1 files changed, 16 insertions, 16 deletions

diff --git a/nephilim/plugins/Lyrics.py b/nephilim/plugins/Lyrics.py
index 33ea369..9239d24 100644
--- a/nephilim/plugins/Lyrics.py
+++ b/nephilim/plugins/Lyrics.py
@@ -128,7 +128,7 @@ class Lyrics(Plugin):
     def __new_lyrics_fetched(self, song, lyrics):
         self.logger.info('Got new lyrics.')
         self.__results += 1
-        if lyrics and self.settings().value(self.name + '/store').toBool():
+        if lyrics and self.settings.value(self.name + '/store').toBool():
             self.save_lyrics_file(lyrics)
             return self.o.set_lyrics(song, lyrics)
         elif self.__results >= len(self.__fetchers) and not self.o.lyrics_loaded:
@@ -271,24 +271,24 @@ 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
             self.store = QtGui.QGroupBox('Store lyrics.')
             self.store.setToolTip('Should %s store its own copy of lyrics?'%misc.APPNAME)
             self.store.setCheckable(True)
-            self.store.setChecked(self.settings().value('store').toBool())
+            self.store.setChecked(self.settings.value('store').toBool())
             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').toString())
             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'
                                       %misc.APPNAME)
-            self.lyricname = QtGui.QLineEdit(self.settings().value('lyricname').toString())
+            self.lyricname = QtGui.QLineEdit(self.settings.value('lyricname').toString())
             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'
@@ -301,20 +301,20 @@ class Lyrics(Plugin):
             self.setLayout(QtGui.QVBoxLayout())
             self.layout().addWidget(self.store)
 
-            self.settings().endGroup()
+            self.settings.endGroup()
 
         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().endGroup()
+            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.endGroup()
             self.plugin.refresh()
 
     #### public ####
     def _load(self):
         for site in self.__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.__fetchers[site] = self.__available_sites[site](self)
         self.o = LyricsWidget(self)
         for fetcher in self.__fetchers:
@@ -342,8 +342,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')
@@ -378,8 +378,8 @@ class Lyrics(Plugin):
         if not song:
             path = self.__lyrics_path
         else:
-            path = misc.generate_metadata_path(song, self.settings().value(self.name + '/lyricdir').toString(),
-                                               self.settings().value(self.name + '/lyricname').toString())
+            path = misc.generate_metadata_path(song, self.settings.value(self.name + '/lyricdir').toString(),
+                                               self.settings.value(self.name + '/lyricname').toString())
 
         try:
             os.remove(path)