From fafc1a985fc1bb54406200d92dc892c5c6f6f03b Mon Sep 17 00:00:00 2001 From: itdominator <1itdominator@gmail.com> Date: Mon, 14 Oct 2024 21:57:18 -0500 Subject: [PATCH] Updated __init__ files; theming css changes, other --- src/__init__.py | 4 ++-- src/core/__init__.py | 2 +- src/core/containers/__init__.py | 4 ++-- src/core/controllers/__init__.py | 2 +- src/core/widgets/__init__.py | 4 ++-- src/core/widgets/controls/__init__.py | 4 ++-- src/core/widgets/webkit/__init__.py | 2 +- src/libs/__init__.py | 4 ++-- src/libs/db/__init__.py | 4 ++-- src/libs/dto/__init__.py | 2 +- src/libs/ipc_server.py | 9 ++++++--- src/libs/mixins/__init__.py | 2 +- src/libs/mixins/ipc_signals_mixin.py | 23 +++++++++++++++++------ src/libs/settings/__init__.py | 4 ++-- src/libs/settings/manager.py | 10 +++++----- src/libs/settings/options/__init__.py | 4 ++-- src/libs/settings/other/__init__.py | 4 ++-- src/plugins/manifest.py | 4 ++++ 18 files changed, 55 insertions(+), 37 deletions(-) diff --git a/src/__init__.py b/src/__init__.py index 90dc8da..6de34b8 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -1,3 +1,3 @@ """ - Start of package. -""" + Src Package. +""" \ No newline at end of file diff --git a/src/core/__init__.py b/src/core/__init__.py index f1af95c..6c4fff7 100644 --- a/src/core/__init__.py +++ b/src/core/__init__.py @@ -1,3 +1,3 @@ """ - Core Module + Core Package """ \ No newline at end of file diff --git a/src/core/containers/__init__.py b/src/core/containers/__init__.py index 4efd4b9..c59e952 100644 --- a/src/core/containers/__init__.py +++ b/src/core/containers/__init__.py @@ -1,3 +1,3 @@ """ - Containers Module -""" + Containers Package +""" \ No newline at end of file diff --git a/src/core/controllers/__init__.py b/src/core/controllers/__init__.py index c004b70..0f53a83 100644 --- a/src/core/controllers/__init__.py +++ b/src/core/controllers/__init__.py @@ -1,3 +1,3 @@ """ - Controllers Module + Controllers Package """ \ No newline at end of file diff --git a/src/core/widgets/__init__.py b/src/core/widgets/__init__.py index 72b072b..a379fc5 100644 --- a/src/core/widgets/__init__.py +++ b/src/core/widgets/__init__.py @@ -1,3 +1,3 @@ """ - Widgets Module -""" + Widgets Package +""" \ No newline at end of file diff --git a/src/core/widgets/controls/__init__.py b/src/core/widgets/controls/__init__.py index f53f627..a82161f 100644 --- a/src/core/widgets/controls/__init__.py +++ b/src/core/widgets/controls/__init__.py @@ -1,3 +1,3 @@ """ - Widgets.Controls Module -""" + Widgets.Controls Package +""" \ No newline at end of file diff --git a/src/core/widgets/webkit/__init__.py b/src/core/widgets/webkit/__init__.py index a0264af..1b77b51 100644 --- a/src/core/widgets/webkit/__init__.py +++ b/src/core/widgets/webkit/__init__.py @@ -1,3 +1,3 @@ """ - WebKit2 UI Module + WebKit2 UI Package """ \ No newline at end of file diff --git a/src/libs/__init__.py b/src/libs/__init__.py index a8e5edd..620f163 100644 --- a/src/libs/__init__.py +++ b/src/libs/__init__.py @@ -1,3 +1,3 @@ """ - Utils module -""" + Libs Package +""" \ No newline at end of file diff --git a/src/libs/db/__init__.py b/src/libs/db/__init__.py index 135071c..d20f589 100644 --- a/src/libs/db/__init__.py +++ b/src/libs/db/__init__.py @@ -1,6 +1,6 @@ """ - DB module + DB Package """ from .models import User -from .db import DB +from .db import DB \ No newline at end of file diff --git a/src/libs/dto/__init__.py b/src/libs/dto/__init__.py index 16675ec..8c55071 100644 --- a/src/libs/dto/__init__.py +++ b/src/libs/dto/__init__.py @@ -1,5 +1,5 @@ """ - Dasta Class module + Dasta Class Package """ from .event import Event \ No newline at end of file diff --git a/src/libs/ipc_server.py b/src/libs/ipc_server.py index a6052c4..ba412d2 100644 --- a/src/libs/ipc_server.py +++ b/src/libs/ipc_server.py @@ -56,7 +56,7 @@ class IPCServer(Singleton): @daemon_threaded def _run_ipc_loop(self, listener) -> None: # NOTE: Not thread safe if using with Gtk. Need to import GLib and use idle_add - while True: + while self.is_ipc_alive: try: conn = listener.accept() start_time = time.perf_counter() @@ -67,7 +67,7 @@ class IPCServer(Singleton): listener.close() def _handle_ipc_message(self, conn, start_time) -> None: - while True: + while self.is_ipc_alive: msg = conn.recv() logger.debug(msg) @@ -76,6 +76,9 @@ class IPCServer(Singleton): if file: event_system.emit("handle-file-from-ipc", file) + conn.close() + break + if "DIR|" in msg: file = msg.split("DIR|")[1].strip() if file: @@ -129,4 +132,4 @@ class IPCServer(Singleton): logger.error("IPC Socket no longer valid.... Removing.") os.unlink(self._ipc_address) except Exception as e: - logger.error( repr(e) ) + logger.error( repr(e) ) \ No newline at end of file diff --git a/src/libs/mixins/__init__.py b/src/libs/mixins/__init__.py index 6eb3b43..e852849 100644 --- a/src/libs/mixins/__init__.py +++ b/src/libs/mixins/__init__.py @@ -1,3 +1,3 @@ """ - Utils/Mixins module + Libs.Mixins Package """ \ No newline at end of file diff --git a/src/libs/mixins/ipc_signals_mixin.py b/src/libs/mixins/ipc_signals_mixin.py index bbabd1e..880266d 100644 --- a/src/libs/mixins/ipc_signals_mixin.py +++ b/src/libs/mixins/ipc_signals_mixin.py @@ -1,6 +1,8 @@ # Python imports # Lib imports +import gi +from gi.repository import GLib # Application imports @@ -8,13 +10,22 @@ class IPCSignalsMixin: - """ IPCSignalsMixin handle messages from another starting solarfm process. """ + """ IPCSignalsMixin handle messages from another starting {APP_NAME} process. """ - def print_to_console(self, message=None): + def print_to_console(self, message = None): logger.debug(message) - def handle_file_from_ipc(self, path: str) -> None: - logger.debug(f"File From IPC: {path}") + def handle_file_from_ipc(self, fpath: str) -> None: + logger.debug(f"File From IPC: {fpath}") + GLib.idle_add( + self.broadcast_message, "handle-file", (fpath,) + ) - def handle_dir_from_ipc(self, path: str) -> None: - logger.debug(f"Dir From IPC: {path}") \ No newline at end of file + def handle_dir_from_ipc(self, fpath: str) -> None: + logger.debug(f"Dir From IPC: {fpath}") + GLib.idle_add( + self.broadcast_message, "handle-folder", (fpath,) + ) + + def broadcast_message(self, message_type: str = "none", data: () = ()) -> None: + event_system.emit(message_type, data) \ No newline at end of file diff --git a/src/libs/settings/__init__.py b/src/libs/settings/__init__.py index a0b3452..228a75d 100644 --- a/src/libs/settings/__init__.py +++ b/src/libs/settings/__init__.py @@ -1,4 +1,4 @@ """ - Settings module + Settings Package """ -from .manager import SettingsManager +from .manager import SettingsManager \ No newline at end of file diff --git a/src/libs/settings/manager.py b/src/libs/settings/manager.py index ab449da..c343b2a 100644 --- a/src/libs/settings/manager.py +++ b/src/libs/settings/manager.py @@ -114,13 +114,13 @@ class SettingsManager(StartCheckMixin, Singleton): self._starting_files = [] - def register_signals_to_builder(self, classes=None): + def register_signals_to_builder(self, classes = None): handlers = {} for c in classes: methods = None try: - methods = inspect.getmembers(c, predicate=inspect.ismethod) + methods = inspect.getmembers(c, predicate = inspect.ismethod) handlers.update(methods) except Exception as e: ... @@ -153,7 +153,7 @@ class SettingsManager(StartCheckMixin, Singleton): def get_home_config_path(self) -> str: return self._HOME_CONFIG_PATH def get_window_icon(self) -> str: return self._WINDOW_ICON def get_home_path(self) -> str: return self._USER_HOME - def get_starting_files(self) -> []: return self._starting_files + def get_starting_files(self) -> list: return self._starting_files def is_trace_debug(self) -> str: return self._trace_debug def is_debug(self) -> str: return self._debug @@ -170,7 +170,7 @@ class SettingsManager(StartCheckMixin, Singleton): def set_main_window_height(self, height = 600): self.settings.config.main_window_height = height def set_main_window_min_width(self, width = 720): self.settings.config.main_window_min_width = width def set_main_window_min_height(self, height = 480): self.settings.config.main_window_min_height = height - def set_starting_files(self, files: []) -> None: self._starting_files = files + def set_starting_files(self, files: list) -> None: self._starting_files = files def set_trace_debug(self, trace_debug): self._trace_debug = trace_debug @@ -178,7 +178,7 @@ class SettingsManager(StartCheckMixin, Singleton): def set_debug(self, debug): self._debug = debug - def set_is_starting_with_file(self, is_passed_in_file: False): + def set_is_starting_with_file(self, is_passed_in_file: bool = False): self._passed_in_file = is_passed_in_file def load_settings(self): diff --git a/src/libs/settings/options/__init__.py b/src/libs/settings/options/__init__.py index 0046efd..e06487a 100644 --- a/src/libs/settings/options/__init__.py +++ b/src/libs/settings/options/__init__.py @@ -1,8 +1,8 @@ """ - Options module + Settings.Options Package """ from .settings import Settings from .config import Config from .filters import Filters from .theming import Theming -from .debugging import Debugging +from .debugging import Debugging \ No newline at end of file diff --git a/src/libs/settings/other/__init__.py b/src/libs/settings/other/__init__.py index e1b5377..c38a726 100644 --- a/src/libs/settings/other/__init__.py +++ b/src/libs/settings/other/__init__.py @@ -1,3 +1,3 @@ """ - Settings Other module -""" + Settings.Other Package +""" \ No newline at end of file diff --git a/src/plugins/manifest.py b/src/plugins/manifest.py index b2320f5..7cb701c 100644 --- a/src/plugins/manifest.py +++ b/src/plugins/manifest.py @@ -69,3 +69,7 @@ class ManifestProcessor: loading_data["bind_keys"] = requests["bind_keys"] return self._plugin, loading_data + + def is_pre_launch(self): + return self._plugin.pre_launch +