Plugin rework/fixes

plugins/favorites/plugin.py

@@ -7,6 +7,7 @@ gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
 
 # Application imports
+from plugins.plugin_base import PluginBase
 
 
 # NOTE: Threads WILL NOT die with parent's destruction.
@@ -24,22 +25,18 @@ def daemon_threaded(fn):
 
 
 
-class Plugin:
+class Plugin(PluginBase):
     def __init__(self):
+        super().__init__()
+
         self.name               = "Favorites"  # NOTE: Need to remove after establishing private bidirectional 1-1 message bus
                                                       #       where self.name should not be needed for message comms
         self.path               = os.path.dirname(os.path.realpath(__file__))
         self._GLADE_FILE        = f"{self.path}/favorites.glade"
         self._FAVORITES_FILE    = f"{self.path}/favorites.json"
 
-        self._builder           = None
-        self._event_system      = None
-        self._event_sleep_time  = .5
-        self._event_message     = None
-
         self._favorites_dialog  = None
         self._favorites_store   = None
-        self._ui_objects        = None
         self._favorites         = None
         self._state             = None
         self._selected          = None
@@ -50,12 +47,6 @@ class Plugin:
         button.connect("button-release-event", self._show_favorites_menu)
         return button
 
-    def set_fm_event_system(self, fm_event_system):
-        self._event_system = fm_event_system
-
-    def set_ui_object_collection(self, ui_objects):
-        self._ui_objects = ui_objects
-
     def run(self):
         self._module_event_observer()
 
@@ -137,31 +128,6 @@ class Plugin:
         if selected:
             self._selected = selected
 
-    def wait_for_fm_message(self):
-        while not self._event_message:
-            pass
-
     def wait_for_state(self):
         while not self._state:
             pass
-
-    @daemon_threaded
-    def _module_event_observer(self):
-        while True:
-            time.sleep(self._event_sleep_time)
-            event = self._event_system.read_module_event()
-            if event:
-                try:
-                    if event[0] == self.name:
-                        target_id, method_target, data = self._event_system.consume_module_event()
-
-                        if not method_target:
-                            self._event_message = data
-                        else:
-                            method = getattr(self.__class__, f"{method_target}")
-                            if data:
-                                data = method(*(self, *data))
-                            else:
-                                method(*(self,))
-                except Exception as e:
-                    print(repr(e))