Removed StatusIcon; updated IPC logic

This commit is contained in:
2025-12-10 20:27:22 -06:00
parent 0af82f65c5
commit 9a1ca20235
3 changed files with 22 additions and 17 deletions

View File

@@ -23,13 +23,14 @@ class Application:
def __init__(self): def __init__(self):
super(Application, self).__init__() super(Application, self).__init__()
if not settings_manager.is_trace_debug():
self.load_ipc()
self.setup_debug_hook() self.setup_debug_hook()
def run(self): def run(self):
if not settings_manager.is_trace_debug():
if not self.load_ipc():
return
win = Window() win = Window()
win.start() win.start()
@@ -39,13 +40,20 @@ class Application:
ipc_server = IPCServer() ipc_server = IPCServer()
self.ipc_realization_check(ipc_server) self.ipc_realization_check(ipc_server)
if not ipc_server.is_ipc_alive: if ipc_server.is_ipc_alive:
for arg in unknownargs + [args.new_tab,]: return True
if os.path.isfile(arg):
message = f"FILE|{arg}"
ipc_server.send_ipc_message(message)
raise AppLaunchException(f"{APP_NAME} IPC Server Exists: Have sent path(s) to it and closing...") logger.warning(f"{app_name} IPC Server Exists: Have sent path(s) to it and closing...")
for arg in unknownargs + [args.new_tab,]:
if os.path.isfile(arg):
message = f"FILE|{arg}"
ipc_server.send_ipc_message(message)
if os.path.isdir(arg):
message = f"DIR|{arg}"
ipc_server.send_ipc_message(message)
return False
def ipc_realization_check(self, ipc_server): def ipc_realization_check(self, ipc_server):
try: try:

View File

@@ -11,7 +11,6 @@ from gi.repository import Gdk
from gi.repository import GLib from gi.repository import GLib
# Application imports # Application imports
from libs.status_icon import StatusIcon
from core.controllers.base_controller import BaseController from core.controllers.base_controller import BaseController
@@ -28,7 +27,6 @@ class Window(Gtk.ApplicationWindow):
super(Window, self).__init__() super(Window, self).__init__()
settings_manager.set_main_window(self) settings_manager.set_main_window(self)
self._status_icon = None
self._controller = None self._controller = None
self.guake_key = settings_manager.get_guake_key() self.guake_key = settings_manager.get_guake_key()
self.hidefunc = None self.hidefunc = None
@@ -79,7 +77,6 @@ class Window(Gtk.ApplicationWindow):
self.set_interactive_debugging(True) self.set_interactive_debugging(True)
self._controller = BaseController() self._controller = BaseController()
self._status_icon = StatusIcon()
if not self._controller: if not self._controller:
raise ControllerStartException("BaseController exited and doesn't exist...") raise ControllerStartException("BaseController exited and doesn't exist...")
@@ -95,10 +92,6 @@ class Window(Gtk.ApplicationWindow):
return 'X11' return 'X11'
def _set_size_constraints(self): def _set_size_constraints(self):
# _window_x = settings.config.main_window_x
# _window_y = settings.config.main_window_y
# self.move(_window_x, _window_y - 28)
_min_width = settings.config.main_window_min_width _min_width = settings.config.main_window_min_width
_min_height = settings.config.main_window_min_height _min_height = settings.config.main_window_min_height
_width = settings.config.main_window_width _width = settings.config.main_window_width

View File

@@ -61,8 +61,12 @@ class IPCServer(Singleton):
conn = listener.accept() conn = listener.accept()
start_time = time.perf_counter() start_time = time.perf_counter()
self._handle_ipc_message(conn, start_time) self._handle_ipc_message(conn, start_time)
except EOFError as e:
logger.debug( repr(e) )
except Exception as e: except Exception as e:
logger.debug( repr(e) ) logger.debug( repr(e) )
finally:
conn.close()
listener.close() listener.close()
@@ -88,7 +92,7 @@ class IPCServer(Singleton):
break break
if msg in ['close connection', 'close server']: if msg in ['close connection', 'close server', 'Empty Data...']:
conn.close() conn.close()
break break