rename misc->common

10 files changed, 22 insertions, 22 deletions

diff --git a/nephilim/misc.py b/nephilim/common.py
index d4d7b47..d4d7b47 100644
--- a/nephilim/misc.py
+++ b/nephilim/common.py
diff --git a/nephilim/nephilim_app.py b/nephilim/nephilim_app.py
index 8caf187..ad340da 100644
--- a/nephilim/nephilim_app.py
+++ b/nephilim/nephilim_app.py
@@ -18,7 +18,7 @@
 from PyQt4 import QtGui, QtCore
 
 from winMain     import winMain
-from misc        import ORGNAME, APPNAME, appIcon
+from common      import ORGNAME, APPNAME, appIcon
 from mpclient    import MPClient
 from settings_wg import SettingsWidget
 from connect_wg  import ConnectWidget
diff --git a/nephilim/plugins/AlbumCover.py b/nephilim/plugins/AlbumCover.py
index c64875d..f54b101 100644
--- a/nephilim/plugins/AlbumCover.py
+++ b/nephilim/plugins/AlbumCover.py
@@ -21,7 +21,7 @@ from PyQt4.QtCore import QVariant
 import os
 
 from ..plugin import Plugin
-from ..       import misc
+from ..       import common
 
 
 class AlbumCoverWidget(QtGui.QLabel):
@@ -144,7 +144,7 @@ class AlbumCover(Plugin):
 
             # store covers groupbox
             self.store = QtGui.QGroupBox('Store covers.')
-            self.store.setToolTip('Should %s store its own copy of covers?'%misc.APPNAME)
+            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.setLayout(QtGui.QGridLayout())
@@ -155,12 +155,12 @@ class AlbumCover(Plugin):
                                      '$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'
-                                      %misc.APPNAME)
+                                      %common.APPNAME)
             self.covername = QtGui.QLineEdit(self.settings.value('covername').toString())
             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'
-                                      '$album, $genre etc.'%misc.APPNAME)
+                                      '$album, $genre etc.'%common.APPNAME)
             self.store.layout().addWidget(QtGui.QLabel('Cover directory'), 0, 0)
             self.store.layout().addWidget(self.coverdir, 0, 1)
             self.store.layout().addWidget(QtGui.QLabel('Cover filename'), 1, 0)
@@ -202,7 +202,7 @@ class AlbumCover(Plugin):
             self.settings.endGroup()
             self.plugin.refresh()
 
-    class FetcherLastfm(misc.MetadataFetcher):
+    class FetcherLastfm(common.MetadataFetcher):
         name = 'Last.fm'
 
         def fetch(self, song):
@@ -318,7 +318,7 @@ class AlbumCover(Plugin):
             self.__cover_path = ''
             return self.o.set_cover(None, None)
 
-        (self.__cover_dir, self.__cover_path) = misc.generate_metadata_path(song,
+        (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())
         try:
@@ -360,7 +360,7 @@ class AlbumCover(Plugin):
         if not song:
             path = self.__cover_path
         else:
-            path = misc.generate_metadata_path(song, self.settings.value(self.name + '/coverdir').toString(),
+            path = common.generate_metadata_path(song, self.settings.value(self.name + '/coverdir').toString(),
                                                self.settings.value(self.name + '/covername').toString())
         if not QtCore.QFile.remove(path):
             self.logger.error('Error removing file %s.'%path)
diff --git a/nephilim/plugins/Lyrics.py b/nephilim/plugins/Lyrics.py
index 0c90e8c..15160d8 100644
--- a/nephilim/plugins/Lyrics.py
+++ b/nephilim/plugins/Lyrics.py
@@ -23,7 +23,7 @@ import re
 from   lxml import etree
 
 from ..plugin import Plugin
-from ..       import misc
+from ..       import common
 
 class LyricsWidget(QtGui.QWidget):
     #public
@@ -140,7 +140,7 @@ class Lyrics(Plugin):
         elif self.__results >= len(self.__fetchers) and not self.o.lyrics_loaded:
             self.o.set_lyrics(song, None)
 
-    class FetchLyricwiki(misc.MetadataFetcher):
+    class FetchLyricwiki(common.MetadataFetcher):
         name = 'Lyricwiki'
 
         def fetch(self, song):
@@ -189,7 +189,7 @@ class Lyrics(Plugin):
                     lyrics += etree.tostring(elem, method = 'text', encoding = 'utf-8')
             self.finish(lyrics)
 
-    class FetchAnimelyrics(misc.MetadataFetcher):
+    class FetchAnimelyrics(common.MetadataFetcher):
         name = 'Animelyrics'
 
         def fetch(self, song):
@@ -246,7 +246,7 @@ class Lyrics(Plugin):
 
             # store lyrics groupbox
             self.store = QtGui.QGroupBox('Store lyrics.')
-            self.store.setToolTip('Should %s store its own copy of lyrics?'%misc.APPNAME)
+            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.setLayout(QtGui.QGridLayout())
@@ -257,12 +257,12 @@ class Lyrics(Plugin):
                                      '$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)
+                                      %common.APPNAME)
             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'
-                                      '$album, $genre etc.'%misc.APPNAME)
+                                      '$album, $genre etc.'%common.APPNAME)
             self.store.layout().addWidget(QtGui.QLabel('Lyrics directory'), 0, 0)
             self.store.layout().addWidget(self.lyricdir, 0, 1)
             self.store.layout().addWidget(QtGui.QLabel('Lyrics filename'), 1, 0)
@@ -333,7 +333,7 @@ class Lyrics(Plugin):
             self.__lyrics_path = ''
             return self.o.set_lyrics(None, None)
 
-        (self.__lyrics_dir, self.__lyrics_path) = misc.generate_metadata_path(song,
+        (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())
         try:
@@ -370,7 +370,7 @@ class Lyrics(Plugin):
         if not song:
             path = self.__lyrics_path
         else:
-            path = misc.generate_metadata_path(song, self.settings.value(self.name + '/lyricdir').toString(),
+            path = common.generate_metadata_path(song, self.settings.value(self.name + '/lyricdir').toString(),
                                                self.settings.value(self.name + '/lyricname').toString())
 
         try:
diff --git a/nephilim/plugins/Notify.py b/nephilim/plugins/Notify.py
index e2204fa..d8b26b9 100644
--- a/nephilim/plugins/Notify.py
+++ b/nephilim/plugins/Notify.py
@@ -20,7 +20,7 @@ from PyQt4 import QtGui, QtCore
 from PyQt4.QtCore import QVariant
 from traceback import print_exc
 
-from ..misc     import sec2min, APPNAME, expand_tags
+from ..common     import sec2min, APPNAME, expand_tags
 from ..plugin import Plugin
 from ..         import plugins
 
diff --git a/nephilim/plugins/PlayControl.py b/nephilim/plugins/PlayControl.py
index 8153eb7..0784bab 100644
--- a/nephilim/plugins/PlayControl.py
+++ b/nephilim/plugins/PlayControl.py
@@ -18,7 +18,7 @@
 from PyQt4 import QtGui, QtCore
 from PyQt4.QtCore import QVariant
 
-from ..misc import Button
+from ..common import Button
 from ..plugin import Plugin
 
 class wgPlayControl(QtGui.QToolBar):
diff --git a/nephilim/plugins/Systray.py b/nephilim/plugins/Systray.py
index 558fc24..e093c9f 100644
--- a/nephilim/plugins/Systray.py
+++ b/nephilim/plugins/Systray.py
@@ -20,7 +20,7 @@ from PyQt4 import QtGui, QtCore
 from PyQt4.QtCore import QVariant
 
 from ..plugin import Plugin
-from ..misc import sec2min, APPNAME, appIcon, expand_tags
+from ..common import sec2min, APPNAME, appIcon, expand_tags
 
 class Systray(Plugin):
     o         = None
diff --git a/nephilim/settings_wg.py b/nephilim/settings_wg.py
index 5d5aafe..1175936 100644
--- a/nephilim/settings_wg.py
+++ b/nephilim/settings_wg.py
@@ -20,7 +20,7 @@ from PyQt4 import QtGui, QtCore
 from PyQt4.QtCore import QVariant
 import os
 
-from misc import Button
+from common import Button
 import plugin
 
 
diff --git a/nephilim/song.py b/nephilim/song.py
index bc0d1c4..008312a 100644
--- a/nephilim/song.py
+++ b/nephilim/song.py
@@ -19,7 +19,7 @@
 from PyQt4 import QtCore
 import os
 
-from misc import sec2min
+from common import sec2min
 
 class Song:
     """The Song class offers an abstraction of a song."""
diff --git a/nephilim/winMain.py b/nephilim/winMain.py
index 54f7551..2912303 100644
--- a/nephilim/winMain.py
+++ b/nephilim/winMain.py
@@ -20,7 +20,7 @@ from PyQt4 import QtGui, QtCore
 from PyQt4.QtCore import QVariant
 import logging
 
-from misc import APPNAME, sec2min, appIcon
+from common import APPNAME, sec2min, appIcon
 
 DEFAULT_LAYOUT_FILE = 'default_layout'