fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-04-28 23:31:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Global plugins are overwriting User-plugins.

Browse Source 
Since the global plugins (from picard/plugins) have been read *after*
the ones in user-plugindir, plugins got overwritten if they have the same
name. Now the user-plugindir is read after the globel one, thus the
user plugins are overwriting the global plugins -- which is more
appropriate.

Signed-off-by: brainz34 <brainz34@musicbrainz.org>
This commit is contained in:
brainz34
2013-04-11 21:23:42 +02:00
parent 243eed13b8
commit cccc1a3c1a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
picard/tagger.py
View File

@@ -160,14 +160,14 @@ class Tagger(QtGui.QApplication):
# Load plugins
self.pluginmanager = PluginManager()
self.user_plugin_dir = os.path.join(self.userdir, "plugins")
if not os.path.exists(self.user_plugin_dir):
os.makedirs(self.user_plugin_dir)
self.pluginmanager.load_plugindir(self.user_plugin_dir)
if hasattr(sys, "frozen"):
self.pluginmanager.load_plugindir(os.path.join(os.path.dirname(sys.argv[0]), "plugins"))
else:
self.pluginmanager.load_plugindir(os.path.join(os.path.dirname(__file__), "plugins"))
self.user_plugin_dir = os.path.join(self.userdir, "plugins")
if not os.path.exists(self.user_plugin_dir):
os.makedirs(self.user_plugin_dir)
self.pluginmanager.load_plugindir(self.user_plugin_dir)
self.acoustidmanager = AcoustIDManager()
self.browser_integration = BrowserIntegration()