From a0f32a7c007be89acfb202b07502d7c57802ba9f Mon Sep 17 00:00:00 2001 From: itdominator <1itdominator@gmail.com> Date: Thu, 29 Feb 2024 18:50:34 -0600 Subject: [PATCH] app_name --> APP_NAME --- src/__builtins__.py | 2 +- src/__main__.py | 2 +- src/app.py | 2 +- src/core/window.py | 2 +- src/libs/ipc_server.py | 6 ++--- src/libs/settings/manager.py | 22 +++++++++---------- src/libs/settings/other/webkit_ui_settings.py | 2 +- src/libs/settings/start_check_mixin.py | 4 ++-- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/__builtins__.py b/src/__builtins__.py index 770a5a3..37abfc6 100644 --- a/src/__builtins__.py +++ b/src/__builtins__.py @@ -35,7 +35,7 @@ def daemon_threaded_wrapper(fn): # NOTE: Just reminding myself we can add to builtins two different ways... # __builtins__.update({"event_system": Builtins()}) -builtins.app_name = "" +builtins.APP_NAME = "" builtins.keybindings = Keybindings() builtins.event_system = EventSystem() diff --git a/src/__main__.py b/src/__main__.py index f5121f8..21ed66f 100644 --- a/src/__main__.py +++ b/src/__main__.py @@ -18,7 +18,7 @@ from app import Application def main(args, unknownargs): - setproctitle(f'{app_name}') + setproctitle(f'{APP_NAME}') if args.debug == "true": settings_manager.set_debug(True) diff --git a/src/app.py b/src/app.py index b945b22..3fd5717 100644 --- a/src/app.py +++ b/src/app.py @@ -39,7 +39,7 @@ class Application: 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...") + raise AppLaunchException(f"{APP_NAME} IPC Server Exists: Have sent path(s) to it and closing...") def ipc_realization_check(self, ipc_server): try: diff --git a/src/core/window.py b/src/core/window.py index d67e3da..3f73174 100644 --- a/src/core/window.py +++ b/src/core/window.py @@ -41,7 +41,7 @@ class Window(Gtk.ApplicationWindow): def _setup_styling(self): - self.set_title(f"{app_name}") + self.set_title(f"{APP_NAME}") self.set_icon_from_file( settings_manager.get_window_icon() ) self.set_gravity(5) # 5 = CENTER self.set_position(1) # 1 = CENTER, 4 = CENTER_ALWAYS diff --git a/src/libs/ipc_server.py b/src/libs/ipc_server.py index e72f989..a6052c4 100644 --- a/src/libs/ipc_server.py +++ b/src/libs/ipc_server.py @@ -13,17 +13,17 @@ from .singleton import Singleton class IPCServer(Singleton): - """ Create a listener so that other {app_name} instances send requests back to existing instance. """ + """ Create a listener so that other {APP_NAME} instances send requests back to existing instance. """ def __init__(self, ipc_address: str = '127.0.0.1', conn_type: str = "socket"): self.is_ipc_alive = False self._ipc_port = 4848 self._ipc_address = ipc_address self._conn_type = conn_type - self._ipc_authkey = b'' + bytes(f'{app_name}-ipc', 'utf-8') + self._ipc_authkey = b'' + bytes(f'{APP_NAME}-ipc', 'utf-8') self._ipc_timeout = 15.0 if conn_type == "socket": - self._ipc_address = f'/tmp/{app_name}-ipc.sock' + self._ipc_address = f'/tmp/{APP_NAME}-ipc.sock' elif conn_type == "full_network": self._ipc_address = '0.0.0.0' elif conn_type == "full_network_unsecured": diff --git a/src/libs/settings/manager.py b/src/libs/settings/manager.py index da1b183..cb465bc 100644 --- a/src/libs/settings/manager.py +++ b/src/libs/settings/manager.py @@ -24,8 +24,8 @@ class SettingsManager(StartCheckMixin, Singleton): def __init__(self): self._SCRIPT_PTH = path.dirname(path.realpath(__file__)) self._USER_HOME = path.expanduser('~') - self._HOME_CONFIG_PATH = f"{self._USER_HOME}/.config/{app_name.lower()}" - self._USR_PATH = f"/usr/share/{app_name.lower()}" + self._HOME_CONFIG_PATH = f"{self._USER_HOME}/.config/{APP_NAME.lower()}" + self._USR_PATH = f"/usr/share/{APP_NAME.lower()}" self._USR_CONFIG_FILE = f"{self._USR_PATH}/settings.json" self._CONTEXT_PATH = f"{self._HOME_CONFIG_PATH}/context_path" @@ -35,10 +35,10 @@ class SettingsManager(StartCheckMixin, Singleton): self._GLADE_FILE = f"{self._HOME_CONFIG_PATH}/Main_Window.glade" self._CSS_FILE = f"{self._HOME_CONFIG_PATH}/stylesheet.css" self._KEY_BINDINGS_FILE = f"{self._HOME_CONFIG_PATH}/key-bindings.json" - self._PID_FILE = f"{self._HOME_CONFIG_PATH}/{app_name.lower()}.pid" + self._PID_FILE = f"{self._HOME_CONFIG_PATH}/{APP_NAME.lower()}.pid" self._UI_WIDEGTS_PATH = f"{self._HOME_CONFIG_PATH}/ui_widgets" self._CONTEXT_MENU = f"{self._HOME_CONFIG_PATH}/contexct_menu.json" - self._WINDOW_ICON = f"{self._DEFAULT_ICONS}/{app_name.lower()}.png" + self._WINDOW_ICON = f"{self._DEFAULT_ICONS}/{APP_NAME.lower()}.png" # self._USR_CONFIG_FILE = f"{self._USR_PATH}/settings.json" # self._PLUGINS_PATH = f"plugins" @@ -46,8 +46,8 @@ class SettingsManager(StartCheckMixin, Singleton): # self._GLADE_FILE = f"Main_Window.glade" # self._CSS_FILE = f"stylesheet.css" # self._KEY_BINDINGS_FILE = f"key-bindings.json" - # self._PID_FILE = f"{app_name.lower()}.pid" - # self._WINDOW_ICON = f"{app_name.lower()}.png" + # self._PID_FILE = f"{APP_NAME.lower()}.pid" + # self._WINDOW_ICON = f"{APP_NAME.lower()}.png" # self._UI_WIDEGTS_PATH = f"ui_widgets" # self._CONTEXT_MENU = f"contexct_menu.json" # self._DEFAULT_ICONS = f"icons" @@ -79,7 +79,7 @@ class SettingsManager(StartCheckMixin, Singleton): if not path.exists(self._CSS_FILE): raise MissingConfigError("Unable to find the application Stylesheet file.") if not path.exists(self._WINDOW_ICON): - self._WINDOW_ICON = f"{self._USR_PATH}/icons/{app_name.lower()}.png" + self._WINDOW_ICON = f"{self._USR_PATH}/icons/{APP_NAME.lower()}.png" if not path.exists(self._WINDOW_ICON): raise MissingConfigError("Unable to find the application icon.") if not path.exists(self._UI_WIDEGTS_PATH): @@ -164,10 +164,10 @@ class SettingsManager(StartCheckMixin, Singleton): method = getattr(target_class, method_name, lambda data: f"No valid key passed...\nkey={method_name}\nargs={data}") return method(data) if data else method() - def set_main_window_x(self, x = 0): self.settings.config.main_window_x = x - def set_main_window_y(self, y = 0): self.settings.config.main_window_y = y - def set_main_window_width(self, width = 800): self.settings.config.main_window_width = width - def set_main_window_height(self, height = 600): self.settings.config.main_window_height = height + def set_main_window_x(self, x = 0): self.settings.config.main_window_x = x + def set_main_window_y(self, y = 0): self.settings.config.main_window_y = y + def set_main_window_width(self, width = 800): self.settings.config.main_window_width = width + 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 diff --git a/src/libs/settings/other/webkit_ui_settings.py b/src/libs/settings/other/webkit_ui_settings.py index 962fe60..981ea49 100644 --- a/src/libs/settings/other/webkit_ui_settings.py +++ b/src/libs/settings/other/webkit_ui_settings.py @@ -39,4 +39,4 @@ class WebkitUISettings(WebKit2.Settings): self.set_enable_webaudio(True) self.set_enable_accelerated_2d_canvas(True) - self.set_user_agent(f"{app_name}") \ No newline at end of file + self.set_user_agent(f"{APP_NAME}") \ No newline at end of file diff --git a/src/libs/settings/start_check_mixin.py b/src/libs/settings/start_check_mixin.py index 6fc8208..b47d9bd 100644 --- a/src/libs/settings/start_check_mixin.py +++ b/src/libs/settings/start_check_mixin.py @@ -41,7 +41,7 @@ class StartCheckMixin: try: os.kill(pid, 0) except OSError: - print(f"{app_name} PID file exists but PID is irrelevant; starting dirty...") + print(f"{APP_NAME} PID file exists but PID is irrelevant; starting dirty...") self._dirty_start = True return False @@ -53,7 +53,7 @@ class StartCheckMixin: self._print_pid(pid) def _print_pid(self, pid): - print(f"{app_name} PID: {pid}") + print(f"{APP_NAME} PID: {pid}") def _clean_pid(self): os.unlink(self._PID_FILE)