From 8862a80eeac7863c5d62376939a1f2f048fd73da Mon Sep 17 00:00:00 2001 From: itdominator <1itdominator@gmail.com> Date: Wed, 18 Oct 2023 21:51:24 -0500 Subject: [PATCH] Small IPC fixes --- src/versions/solarfm-0.0.1/solarfm/app.py | 17 ++++++++++------- .../solarfm-0.0.1/solarfm/utils/ipc_server.py | 2 +- .../solarfm/utils/types/__init__.py | 4 ++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/versions/solarfm-0.0.1/solarfm/app.py b/src/versions/solarfm-0.0.1/solarfm/app.py index 2661090..209e350 100644 --- a/src/versions/solarfm-0.0.1/solarfm/app.py +++ b/src/versions/solarfm-0.0.1/solarfm/app.py @@ -22,10 +22,7 @@ class Application(IPCServer): super(Application, self).__init__() if not settings_manager.is_trace_debug(): - try: - self.create_ipc_listener() - except Exception: - self.socket_realization_check() + self.socket_realization_check() if not self.is_ipc_alive: for arg in unknownargs + [args.new_tab,]: @@ -36,13 +33,19 @@ class Application(IPCServer): raise AppLaunchException(f"{app_name} IPC Server Exists: Will send path(s) to it and close...") self.setup_debug_hook() - Window(args, unknownargs) def socket_realization_check(self): - self.send_test_ipc_message() - self.create_ipc_listener() + try: + self.create_ipc_listener() + except Exception: + self.send_test_ipc_message() + + try: + self.create_ipc_listener() + except Exception as e: + ... def setup_debug_hook(self): try: diff --git a/src/versions/solarfm-0.0.1/solarfm/utils/ipc_server.py b/src/versions/solarfm-0.0.1/solarfm/utils/ipc_server.py index 1b8af6b..7ce42e1 100644 --- a/src/versions/solarfm-0.0.1/solarfm/utils/ipc_server.py +++ b/src/versions/solarfm-0.0.1/solarfm/utils/ipc_server.py @@ -40,7 +40,7 @@ class IPCServer(Singleton): def create_ipc_listener(self) -> None: if self._conn_type == "socket": - if os.path.exists(self._ipc_address) and settings.is_dirty_start(): + if os.path.exists(self._ipc_address) and settings_manager.is_dirty_start(): os.unlink(self._ipc_address) listener = Listener(address = self._ipc_address, family = "AF_UNIX", authkey = self._ipc_authkey) diff --git a/src/versions/solarfm-0.0.1/solarfm/utils/types/__init__.py b/src/versions/solarfm-0.0.1/solarfm/utils/types/__init__.py index a8e5edd..cb82cc2 100644 --- a/src/versions/solarfm-0.0.1/solarfm/utils/types/__init__.py +++ b/src/versions/solarfm-0.0.1/solarfm/utils/types/__init__.py @@ -1,3 +1,3 @@ """ - Utils module -""" + Types module +""" \ No newline at end of file