Add plugin-added/plugin-removed events

This is useful as the PluginInstaller plugin does not need to manually
add/remove plugins inside the PluginWindow anymore

gajim/plugins/gui.py

@@ -31,8 +31,10 @@
 
 from gajim.common import app
 from gajim.common import configpaths
+from gajim.common import ged
 from gajim.common.exceptions import PluginsystemError
 from gajim.common.helpers import open_uri
+from gajim.common.nec import EventHelper
 
 from gajim.plugins.helpers import log_calls
 from gajim.plugins.helpers import GajimPluginActivateException
@@ -55,12 +57,12 @@ class Column(IntEnum):
     ICON = 4
 
 
-class PluginsWindow:
-    '''Class for Plugins window'''
+class PluginsWindow(EventHelper):
 
     @log_calls('PluginsWindow')
     def __init__(self):
-        '''Initialize Plugins window'''
+        EventHelper.__init__(self)
+
         builder = get_builder('plugins_window.ui')
         self.window = builder.get_object('plugins_window')
         self.window.set_transient_for(app.interface.roster.window)
@@ -126,6 +128,11 @@ def __init__(self):
         # Adding GUI extension point for Plugins that want to hook the Plugin Window
         app.plugin_manager.gui_extension_point('plugin_window', self)
 
+        self.register_events([
+            ('plugin-removed', ged.GUI1, self._on_plugin_removed),
+            ('plugin-added', ged.GUI1, self._on_plugin_added),
+        ])
+
         self.window.show_all()
 
     def on_key_press_event(self, widget, event):
@@ -213,6 +220,7 @@ def installed_plugins_toggled_cb(self, cell, path):
     @log_calls('PluginsWindow')
     def on_plugins_window_destroy(self, widget):
         '''Close window'''
+        self.unregister_events()
         app.plugin_manager.remove_gui_extension_point('plugin_window', self)
         del app.interface.instances['plugins']
 
@@ -246,7 +254,20 @@ def on_uninstall_plugin_button_clicked(self, widget):
                 WarningDialog(_('Unable to properly remove the plugin'),
                     str(e), self.window)
                 return
-            model.remove(iter_)
+
+    def _on_plugin_removed(self, event):
+        for row in self.installed_plugins_model:
+            if row[Column.PLUGIN] == event.plugin:
+                self.installed_plugins_model.remove(row.iter)
+                break
+
+    def _on_plugin_added(self, event):
+        icon = self.get_plugin_icon(event.plugin)
+        self.installed_plugins_model.append([event.plugin,
+                                             event.plugin.name,
+                                             False,
+                                             event.plugin.activatable,
+                                             icon])
 
     @log_calls('PluginsWindow')
     def on_install_plugin_button_clicked(self, widget):
@@ -267,21 +288,6 @@ def _on_yes():
                 if not plugin:
                     show_warn_dialog()
                     return
-                model = self.installed_plugins_model
-
-                for _index, row in enumerate(model):
-                    if plugin == row[Column.PLUGIN]:
-                        model.remove(row.iter)
-                        break
-
-                iter_ = model.append([
-                    plugin,
-                    plugin.name,
-                    False,
-                    plugin.activatable,
-                    self.get_plugin_icon(plugin)])
-                sel = self.installed_plugins_treeview.get_selection()
-                sel.select_iter(iter_)
 
             NewConfirmationDialog(
                 _('Overwrite Plugin?'),
@@ -307,11 +313,6 @@ def _try_install(zip_filename):
             if not plugin:
                 show_warn_dialog()
                 return
-            model = self.installed_plugins_model
-            iter_ = model.append([plugin, plugin.name, False,
-                plugin.activatable, self.get_plugin_icon(plugin)])
-            sel = self.installed_plugins_treeview.get_selection()
-            sel.select_iter(iter_)
 
         ArchiveChooserDialog(_try_install, transient_for=self.window)
 

gajim/plugins/pluginmanager.py

@@ -36,6 +36,7 @@
 from gajim.common import nec
 from gajim.common import configpaths
 from gajim.common import modules
+from gajim.common.nec import NetworkEvent
 from gajim.common.i18n import _
 from gajim.common.exceptions import PluginsystemError
 from gajim.common.helpers import Singleton
@@ -192,6 +193,8 @@ def add_plugin(self, plugin_class):
 
             self.plugins.append(plugin)
             plugin.active = False
+            app.nec.push_incoming_event(
+                NetworkEvent('plugin-added', plugin=plugin))
         else:
             log.info('Not loading plugin %s v%s from module %s '
                      '(identified by short name: %s). Plugin already loaded.',
@@ -798,11 +801,16 @@ def uninstall_plugin(self, plugin):
         '''
         Deactivate and remove plugin from `plugins` list
         '''
-        if plugin:
-            self.remove_plugin(plugin)
-            self.delete_plugin_files(plugin.__path__)
-            if self._plugin_has_entry_in_global_config(plugin):
-                self._remove_plugin_entry_in_global_config(plugin)
+        if not plugin:
+            return
+
+        self.remove_plugin(plugin)
+        self.delete_plugin_files(plugin.__path__)
+        if self._plugin_has_entry_in_global_config(plugin):
+            self._remove_plugin_entry_in_global_config(plugin)
+
+        app.nec.push_incoming_event(
+            NetworkEvent('plugin-removed', plugin=plugin))
 
     def get_plugin_by_path(self, plugin_dir):
         for plugin in self.plugins: