dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'tv' of https://github.com/RuudBurger/CouchPotatoServer into tv_tvdb

Browse Source
This commit is contained in:
Jason Mehring
2013-08-24 21:11:53 -04:00
parent 23bde0b866 3cddd29425
commit 19d026756c
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/loader.py
+1 -8
View File
@@ -37,11 +37,7 @@ class Loader(object):
self.addPath(root, ['couchpotato', 'core', 'providers'], 25, recursive = False) self.addPath(root, ['couchpotato', 'core', 'providers'], 25, recursive = False)
# Add media to loader # Add media to loader
self.addPath(root, ['couchpotato', 'core', 'media'], 25, recursive = False) self.addPath(root, ['couchpotato', 'core', 'media'], 25, recursive = True)
# Add Libraries to loader
self.addPath(root, ['couchpotato', 'core', 'media', 'movie'], 1, recursive = False)
self.addPath(root, ['couchpotato', 'core', 'media', 'show'], 1, recursive = False)
for plugin_type, plugin_tuple in self.paths.iteritems(): for plugin_type, plugin_tuple in self.paths.iteritems():
priority, module, dir_name = plugin_tuple priority, module, dir_name = plugin_tuple
@@ -90,9 +86,6 @@ class Loader(object):
splitted = module.split('.') splitted = module.split('.')
for sub in splitted[1:]: for sub in splitted[1:]:
m = getattr(m, sub) m = getattr(m, sub)
if hasattr(m, 'config'):
fireEvent('settings.options', splitted[-1] + '_config', getattr(m, 'config'))
except: except:
raise raise
couchpotato/core/plugins/base.py
+1 -1
View File
@@ -39,7 +39,7 @@ class Plugin(object):
http_failed_disabled = {} http_failed_disabled = {}
def __new__(typ, *args, **kwargs): def __new__(typ, *args, **kwargs):
new_plugin = super(Plugin, typ).__new__(typ, *args, **kwargs) new_plugin = super(Plugin, typ).__new__(typ)
new_plugin.registerPlugin() new_plugin.registerPlugin()
return new_plugin return new_plugin