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

couchpotato/core/loader.py

@@ -37,11 +37,7 @@ class Loader(object):
         self.addPath(root, ['couchpotato', 'core', 'providers'], 25, recursive = False)
 
         # Add media to loader
-        self.addPath(root, ['couchpotato', 'core', 'media'], 25, recursive = False)
-
-        # Add Libraries to loader
-        self.addPath(root, ['couchpotato', 'core', 'media', 'movie'], 1, recursive = False)
-        self.addPath(root, ['couchpotato', 'core', 'media', 'show'], 1, recursive = False)
+        self.addPath(root, ['couchpotato', 'core', 'media'], 25, recursive = True)
 
         for plugin_type, plugin_tuple in self.paths.iteritems():
             priority, module, dir_name = plugin_tuple
@@ -90,9 +86,6 @@ class Loader(object):
             splitted = module.split('.')
             for sub in splitted[1:]:
                 m = getattr(m, sub)
-
-            if hasattr(m, 'config'):
-                fireEvent('settings.options', splitted[-1] + '_config', getattr(m, 'config'))
         except:
             raise
 

couchpotato/core/plugins/base.py

@@ -39,7 +39,7 @@ class Plugin(object):
     http_failed_disabled = {}
 
     def __new__(typ, *args, **kwargs):
-        new_plugin = super(Plugin, typ).__new__(typ, *args, **kwargs)
+        new_plugin = super(Plugin, typ).__new__(typ)
         new_plugin.registerPlugin()
 
         return new_plugin