hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[plugin_installer] Fix error on plugin download

Browse Source 
If a plugin is loaded and errors happen it will not be active, it should
still be displayed correctly in the installed plugins treeview
This commit is contained in:
Philipp Hörist
2018-11-10 23:47:26 +01:00
parent 4a7006be7c
commit 6b6c396dab
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
plugin_installer/plugin_installer.py
View File

@@ -268,27 +268,37 @@ class PluginInstaller(GajimPlugin):
check_update=check_update, auto_update=auto_update) check_update=check_update, auto_update=auto_update)
self.thread.start() self.thread.start()
@staticmethod
def _get_plugin(short_name):
for plugin in app.plugin_manager.plugins:
if plugin.short_name == short_name:
return plugin
def on_plugin_downloaded(self, plugin_dirs, auto_update): def on_plugin_downloaded(self, plugin_dirs, auto_update):
need_restart = False need_restart = False
for _dir in plugin_dirs: for _dir in plugin_dirs:
updated = app.plugin_manager.update_plugins(replace=False, activate=True, plugin_name=_dir) updated = app.plugin_manager.update_plugins(
replace=False, activate=True, plugin_name=_dir)
if updated: if updated:
if not auto_update: if not auto_update:
plugin = app.plugin_manager.get_active_plugin(updated[0]) plugin = self._get_plugin(updated[0])
if plugin is None:
log.error('Plugin %s not found', updated[0])
continue
for row in range(len(self.available_plugins_model)): for row in range(len(self.available_plugins_model)):
model_row = self.available_plugins_model[row] model_row = self.available_plugins_model[row]
if plugin.name == model_row[Column.NAME]: if plugin.name == model_row[Column.NAME]:
model_row[Column.LOCAL_VERSION] = plugin.version model_row[Column.LOCAL_VERSION] = plugin.version
model_row[Column.UPGRADE] = False model_row[Column.UPGRADE] = False
break break
if not auto_update:
# Get plugin icon # Get plugin icon
icon_file = os.path.join(plugin.__path__, os.path.split( icon_file = os.path.join(plugin.__path__, os.path.split(
plugin.__path__)[1]) + '.png' plugin.__path__)[1]) + '.png'
icon = FALLBACK_ICON icon = FALLBACK_ICON
if os.path.isfile(icon_file): if os.path.isfile(icon_file):
icon = GdkPixbuf.Pixbuf.new_from_file_at_size(icon_file, 16, 16) icon = GdkPixbuf.Pixbuf.new_from_file_at_size(icon_file, 16, 16)
row = [plugin, plugin.name, True, plugin.activatable, icon] row = [plugin, plugin.name, plugin.active, plugin.activatable, icon]
self.installed_plugins_model.append(row) self.installed_plugins_model.append(row)
else: else:
need_restart = True need_restart = True