Plugin rework/fixes

plugins/movie_tv_info/plugin.py

@@ -1,5 +1,5 @@
 # Python imports
-import os, threading, subprocess, time, inspect, requests, shutil
+import os, threading, subprocess, inspect, requests, shutil
 
 # Lib imports
 import gi
@@ -8,7 +8,8 @@ gi.require_version('GdkPixbuf', '2.0')
 from gi.repository import Gtk, GLib, GdkPixbuf
 
 # Application imports
-from tmdbscraper import scraper
+from plugins.plugin_base import PluginBase
+from .tmdbscraper import scraper
 
 
 # NOTE: Threads WILL NOT die with parent's destruction.
@@ -26,14 +27,15 @@ def daemon_threaded(fn):
 
 
 
-class Plugin:
+class Plugin(PluginBase):
     def __init__(self):
+        super().__init__()
+
         self.path                   = os.path.dirname(os.path.realpath(__file__))
         self.name                   = "Movie/TV Info"   # NOTE: Need to remove after establishing private bidirectional 1-1 message bus
                                                         #       where self.name should not be needed for message comms
         self._GLADE_FILE            = f"{self.path}/movie_tv_info.glade"
 
-        self._builder               = None
         self._dialog                = None
         self._thumbnail_preview_img = None
         self._tmdb                  = scraper.get_tmdb_scraper()
@@ -43,12 +45,16 @@ class Plugin:
         self._file_location         = None
         self._trailer_link          = None
 
-        self._event_system          = None
-        self._event_sleep_time      = .5
-        self._event_message         = None
 
 
     def get_ui_element(self):
+        button = Gtk.Button(label=self.name)
+        button.connect("button-release-event", self._show_info_page)
+        return button
+
+    def run(self):
+        self._module_event_observer()
+
         self._builder           = Gtk.Builder()
         self._builder.add_from_file(self._GLADE_FILE)
 
@@ -72,17 +78,6 @@ class Plugin:
         self._file_hash             = self._builder.get_object("file_hash")
         self._trailer_link          = self._builder.get_object("trailer_link")
 
-        button = Gtk.Button(label=self.name)
-        button.connect("button-release-event", self._show_info_page)
-        return button
-
-    def set_fm_event_system(self, fm_event_system):
-        self._event_system = fm_event_system
-
-    def run(self):
-        self._module_event_observer()
-
-
     @threaded
     def _show_info_page(self, widget=None, eve=None):
         self._event_system.push_gui_event([self.name, "get_current_state", ()])
@@ -186,31 +181,3 @@ class Plugin:
     def set_trailer_link(self, trailer):
         if trailer:
             self._trailer_link.set_uri(f"https://www.youtube.com/watch?v={trailer}")
-
-
-
-
-    def wait_for_fm_message(self):
-        while not self._event_message:
-            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))