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

Just load media recursively

Browse Source
This commit is contained in:
Ruud
2013-08-24 20:12:59 +02:00
parent 7dd3b0ed15
commit f1948ffb6a
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/loader.py
+2 -12
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
@@ -124,13 +120,7 @@ class Loader(object):
log.warning('Skip startup for plugin %s as it has no start section' % module.__file__) log.warning('Skip startup for plugin %s as it has no start section' % module.__file__)
return False return False
try: try:
klass = module.start() module.start()
klass.registerPlugin()
if klass and getattr(klass, 'auto_register_static'):
klass.registerStatic(module.__file__)
return True
except Exception, e: except Exception, e:
log.error('Failed loading plugin "%s": %s', (module.__file__, traceback.format_exc())) log.error('Failed loading plugin "%s": %s', (module.__file__, traceback.format_exc()))
return False return False