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

Import cleanup

Browse Source 
Conflicts:
	couchpotato/core/providers/torrent/sceneaccess/main.py
This commit is contained in:
Ruud committed 2013-08-24 20:15:54 +02:00
1 parent f1948ffb6a
commit 54a37b577d
2 files changed
+11 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

couchpotato/core/loader.py
+11 -8
View File
@@ -6,20 +6,20 @@ import traceback
log = CPLog(__name__) log = CPLog(__name__)
class Loader(object):
class Loader(object):
plugins = {} plugins = {}
providers = {} providers = {}
modules = {} modules = {}
def addPath(self, root, base_path, priority, recursive=False): def addPath(self, root, base_path, priority, recursive = False):
for filename in os.listdir(os.path.join(root, *base_path)): for filename in os.listdir(os.path.join(root, *base_path)):
path = os.path.join(os.path.join(root, *base_path), filename) path = os.path.join(os.path.join(root, *base_path), filename)
if os.path.isdir(path) and filename[:2] != '__': if os.path.isdir(path) and filename[:2] != '__':
if not u'__init__.py' in os.listdir(path): if not u'__init__.py' in os.listdir(path):
return return
new_base_path = ''.join(s + '.' for s in base_path) + filename new_base_path = ''.join(s + '.' for s in base_path) + filename
self.paths[new_base_path.replace('.', '_')] = (priority, new_base_path, path) self.paths[new_base_path.replace('.', '_')] = (priority, new_base_path, path)
if recursive: if recursive:
self.addPath(root, base_path + [filename], priority, recursive = True) self.addPath(root, base_path + [filename], priority, recursive = True)
@@ -94,14 +94,16 @@ class Loader(object):
for cur_file in glob.glob(os.path.join(dir_name, '*')): for cur_file in glob.glob(os.path.join(dir_name, '*')):
name = os.path.basename(cur_file) name = os.path.basename(cur_file)
if os.path.isdir(os.path.join(dir_name, name)): if os.path.isdir(os.path.join(dir_name, name)) and name != 'static':
module_name = '%s.%s' % (module, name) module_name = '%s.%s' % (module, name)
self.addModule(priority, plugin_type, module_name, name) self.addModule(priority, plugin_type, module_name, name)
def loadSettings(self, module, name, save = True): def loadSettings(self, module, name, save = True):
if not hasattr(module, 'config'): if not hasattr(module, 'config'):
log.warning('Skip loading settings for plugin %s as it has no config section' % module.__file__) log.debug('Skip loading settings for plugin %s as it has no config section' % module.__file__)
return False return False
try: try:
for section in module.config: for section in module.config:
fireEvent('settings.options', section['name'], section) fireEvent('settings.options', section['name'], section)
@@ -116,8 +118,9 @@ class Loader(object):
return False return False
def loadPlugins(self, module, name): def loadPlugins(self, module, name):
if not hasattr(module, 'start'): if not hasattr(module, 'start'):
log.warning('Skip startup for plugin %s as it has no start section' % module.__file__) log.debug('Skip startup for plugin %s as it has no start section' % module.__file__)
return False return False
try: try:
module.start() module.start()
@@ -145,7 +148,7 @@ class Loader(object):
m = getattr(m, sub) m = getattr(m, sub)
return m return m
except ImportError: except ImportError:
log.warning("Skip loading module plugin '%s' as it seems not to be a module." % name) log.debug('Skip loading module plugin %s: %s', (name, traceback.format_exc()))
return None return None
except: except:
raise raise
couchpotato/core/media/_base/library/__init__.py
-1
View File
@@ -1,5 +1,4 @@
from couchpotato.core.event import addEvent from couchpotato.core.event import addEvent
from couchpotato.core.logger import CPLog
from couchpotato.core.plugins.base import Plugin from couchpotato.core.plugins.base import Plugin