From b4564c254092c3ac8efb0e39789f0d71d331c5d3 Mon Sep 17 00:00:00 2001
From: itdominator <1itdominator@gmail.com>
Date: Tue, 1 Feb 2022 00:03:04 -0600
Subject: [PATCH] Changed event method sub names

---
 src/__builtins__.py              | 20 ++++++++++----------
 src/controller/Controller.py     | 13 +++++++++++--
 src/controller/IPCServerMixin.py |  2 +-
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/__builtins__.py b/src/__builtins__.py
index bb2d66a..34de298 100644
--- a/src/__builtins__.py
+++ b/src/__builtins__.py
@@ -20,7 +20,7 @@ class Builtins(IPCServerMixin):
         #             data is the method parameters to give
         #       Where data may be any kind of data
         self._gui_events    = []
-        self._fm_events     = []
+        self._module_events = []
         self.is_ipc_alive   = False
         self.ipc_authkey    = b'app-ipc'
         self.ipc_address    = '127.0.0.1'
@@ -33,9 +33,9 @@ class Builtins(IPCServerMixin):
             return self._gui_events.pop(0)
         return None
 
-    def _pop_fm_event(self):
-        if len(self._fm_events) > 0:
-            return self._fm_events.pop(0)
+    def _pop_module_event(self):
+        if len(self._module_events) > 0:
+            return self._module_events.pop(0)
         return None
 
 
@@ -46,9 +46,9 @@ class Builtins(IPCServerMixin):
 
         raise Exception("Invald event format! Please do:  [type, target, data]")
 
-    def push_fm_event(self, event):
+    def push_module_event(self, event):
         if len(event) == 3:
-            self._fm_events.append(event)
+            self._module_events.append(event)
             return None
 
         raise Exception("Invald event format! Please do:  [type, target, data]")
@@ -56,14 +56,14 @@ class Builtins(IPCServerMixin):
     def read_gui_event(self):
         return self._gui_events[0]
 
-    def read_fm_event(self):
-        return self._fm_events[0]
+    def read_module_event(self):
+        return self._module_events[0]
 
     def consume_gui_event(self):
         return self._pop_gui_event()
 
-    def consume_fm_event(self):
-        return self._pop_fm_event()
+    def consume_module_event(self):
+        return self._pop_module_event()
 
 
 
diff --git a/src/controller/Controller.py b/src/controller/Controller.py
index 0cf98ca..40ddc5b 100644
--- a/src/controller/Controller.py
+++ b/src/controller/Controller.py
@@ -42,11 +42,20 @@ class Controller(DummyMixin, Controller_Data):
             if event:
                 try:
                     type, target, data = event
-                    method = getattr(self.__class__, target)
-                    GLib.idle_add(method, *(self, data,))
+                    if not type:
+                        method = getattr(self.__class__, target)
+                        GLib.idle_add(method, *(self, *data,))
+                    else:
+                        method = getattr(self.__class__, "hadle_gui_event_and_call_back")
+                        GLib.idle_add(method, *(self, type, target, data))
                 except Exception as e:
                     print(repr(e))
 
+    def hadle_gui_event_and_call_back(self, type, target, parameters):
+        method = getattr(self.__class__, target)
+        data   = method(*(self, *parameters))
+        event_system.push_module_event([type, None, (data,)])
+
 
 
     def handle_file_from_ipc(self, path):
diff --git a/src/controller/IPCServerMixin.py b/src/controller/IPCServerMixin.py
index a689101..7410fb8 100644
--- a/src/controller/IPCServerMixin.py
+++ b/src/controller/IPCServerMixin.py
@@ -34,7 +34,7 @@ class IPCServerMixin:
                 if "FILE|" in msg:
                     file = msg.split("FILE|")[1].strip()
                     if file:
-                        event_system.push_gui_event([None, "handle_file_from_ipc", file])
+                        event_system.push_gui_event([None, "handle_file_from_ipc", (file,)])
 
                     conn.close()
                     break