mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-02 22:48:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Plugins] Refactor plugin scan code

Browse source 
Simplify adding entries to the working_set.
Also fixes adding files rather than just dirs to working_set.
This commit is contained in:
Calum Lind 2018-10-31 09:53:22 +00:00
commit d70abd2986
1 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
deluge/pluginmanagerbase.py
View file

@ -94,19 +94,18 @@ class PluginManagerBase(object):
def scan_for_plugins(self): def scan_for_plugins(self):
"""Scans for available plugins""" """Scans for available plugins"""
base_plugin_dir = deluge.common.resource_filename('deluge', 'plugins') base_dir = deluge.common.resource_filename('deluge', 'plugins')
pkg_resources.working_set.add_entry(base_plugin_dir) user_dir = os.path.join(deluge.configmanager.get_config_dir(), 'plugins')
user_plugin_dir = os.path.join(deluge.configmanager.get_config_dir(), 'plugins') base_subdir = [
os.path.join(base_dir, f)
for f in os.listdir(base_dir)
if os.path.isdir(os.path.join(base_dir, f))
]
plugin_dirs = [base_dir, user_dir] + base_subdir
plugins_dirs = [base_plugin_dir] for dirname in plugin_dirs:
for dirname in os.listdir(base_plugin_dir): pkg_resources.working_set.add_entry(dirname)
plugin_dir = os.path.join(base_plugin_dir, dirname) self.pkg_env = pkg_resources.Environment(plugin_dirs, None)
pkg_resources.working_set.add_entry(plugin_dir)
plugins_dirs.append(plugin_dir)
pkg_resources.working_set.add_entry(user_plugin_dir)
plugins_dirs.append(user_plugin_dir)
self.pkg_env = pkg_resources.Environment(plugins_dirs, None)
self.available_plugins = [] self.available_plugins = []
for name in self.pkg_env: for name in self.pkg_env:
@ -139,13 +138,13 @@ class PluginManagerBase(object):
plugin_name = plugin_name.replace(' ', '-') plugin_name = plugin_name.replace(' ', '-')
egg = self.pkg_env[plugin_name][0] egg = self.pkg_env[plugin_name][0]
# Activate is required by non-namespace plugins.
egg.activate() egg.activate()
return_d = defer.succeed(True) return_d = defer.succeed(True)
for name in egg.get_entry_map(self.entry_name): for name in egg.get_entry_map(self.entry_name):
entry_point = egg.get_entry_info(self.entry_name, name)
try: try:
cls = entry_point.load() cls = egg.load_entry_point(self.entry_name, name)
instance = cls(plugin_name.replace('-', '_')) instance = cls(plugin_name.replace('-', '_'))
except component.ComponentAlreadyRegistered as ex: except component.ComponentAlreadyRegistered as ex:
log.error(ex) log.error(ex)