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

Variable cleanup

Browse Source
This commit is contained in:
Ruud
2012-02-14 22:17:34 +01:00
parent 4483292930
commit 6bca3e52be
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/loader.py
+10 -10
View File
@@ -32,9 +32,9 @@ class Loader(object):
self.paths[provider + '_provider'] = (25, 'couchpotato.core.providers.' + provider, path) self.paths[provider + '_provider'] = (25, 'couchpotato.core.providers.' + provider, path)
for type, tuple in self.paths.iteritems(): for plugin_type, plugin_tuple in self.paths.iteritems():
priority, module, dir = tuple priority, module, dir_name = plugin_tuple
self.addFromDir(type, priority, module, dir) self.addFromDir(plugin_type, priority, module, dir_name)
def run(self): def run(self):
did_save = 0 did_save = 0
@@ -59,13 +59,13 @@ class Loader(object):
if did_save: if did_save:
fireEvent('settings.save') fireEvent('settings.save')
def addFromDir(self, type, priority, module, dir): def addFromDir(self, plugin_type, priority, module, dir_name):
for cur_file in glob.glob(os.path.join(dir, '*')): 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)): if os.path.isdir(os.path.join(dir_name, name)):
module_name = '%s.%s' % (module, name) module_name = '%s.%s' % (module, name)
self.addModule(priority, 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):
try: try:
@@ -77,7 +77,7 @@ class Loader(object):
options[option['name']] = option options[option['name']] = option
fireEvent('settings.register', section_name = section['name'], options = options, save = save) fireEvent('settings.register', section_name = section['name'], options = options, save = save)
return True return True
except Exception, e: except:
log.debug("Failed loading settings for '%s': %s" % (name, traceback.format_exc())) log.debug("Failed loading settings for '%s': %s" % (name, traceback.format_exc()))
return False return False
@@ -94,7 +94,7 @@ class Loader(object):
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
def addModule(self, priority, type, module, name): def addModule(self, priority, plugin_type, module, name):
if not self.modules.get(priority): if not self.modules.get(priority):
self.modules[priority] = {} self.modules[priority] = {}
@@ -102,7 +102,7 @@ class Loader(object):
self.modules[priority][module] = { self.modules[priority][module] = {
'priority': priority, 'priority': priority,
'module': module, 'module': module,
'type': type, 'type': plugin_type,
'name': name, 'name': name,
} }