app_name --> APP_NAME
This commit is contained in:
parent
b1096055b7
commit
a0f32a7c00
|
@ -35,7 +35,7 @@ def daemon_threaded_wrapper(fn):
|
||||||
|
|
||||||
# NOTE: Just reminding myself we can add to builtins two different ways...
|
# NOTE: Just reminding myself we can add to builtins two different ways...
|
||||||
# __builtins__.update({"event_system": Builtins()})
|
# __builtins__.update({"event_system": Builtins()})
|
||||||
builtins.app_name = "<change_me>"
|
builtins.APP_NAME = "<change_me>"
|
||||||
|
|
||||||
builtins.keybindings = Keybindings()
|
builtins.keybindings = Keybindings()
|
||||||
builtins.event_system = EventSystem()
|
builtins.event_system = EventSystem()
|
||||||
|
|
|
@ -18,7 +18,7 @@ from app import Application
|
||||||
|
|
||||||
|
|
||||||
def main(args, unknownargs):
|
def main(args, unknownargs):
|
||||||
setproctitle(f'{app_name}')
|
setproctitle(f'{APP_NAME}')
|
||||||
|
|
||||||
if args.debug == "true":
|
if args.debug == "true":
|
||||||
settings_manager.set_debug(True)
|
settings_manager.set_debug(True)
|
||||||
|
|
|
@ -39,7 +39,7 @@ class Application:
|
||||||
message = f"FILE|{arg}"
|
message = f"FILE|{arg}"
|
||||||
ipc_server.send_ipc_message(message)
|
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):
|
def ipc_realization_check(self, ipc_server):
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -41,7 +41,7 @@ class Window(Gtk.ApplicationWindow):
|
||||||
|
|
||||||
|
|
||||||
def _setup_styling(self):
|
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_icon_from_file( settings_manager.get_window_icon() )
|
||||||
self.set_gravity(5) # 5 = CENTER
|
self.set_gravity(5) # 5 = CENTER
|
||||||
self.set_position(1) # 1 = CENTER, 4 = CENTER_ALWAYS
|
self.set_position(1) # 1 = CENTER, 4 = CENTER_ALWAYS
|
||||||
|
|
|
@ -13,17 +13,17 @@ from .singleton import Singleton
|
||||||
|
|
||||||
|
|
||||||
class IPCServer(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"):
|
def __init__(self, ipc_address: str = '127.0.0.1', conn_type: str = "socket"):
|
||||||
self.is_ipc_alive = False
|
self.is_ipc_alive = False
|
||||||
self._ipc_port = 4848
|
self._ipc_port = 4848
|
||||||
self._ipc_address = ipc_address
|
self._ipc_address = ipc_address
|
||||||
self._conn_type = conn_type
|
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
|
self._ipc_timeout = 15.0
|
||||||
|
|
||||||
if conn_type == "socket":
|
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":
|
elif conn_type == "full_network":
|
||||||
self._ipc_address = '0.0.0.0'
|
self._ipc_address = '0.0.0.0'
|
||||||
elif conn_type == "full_network_unsecured":
|
elif conn_type == "full_network_unsecured":
|
||||||
|
|
|
@ -24,8 +24,8 @@ class SettingsManager(StartCheckMixin, Singleton):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self._SCRIPT_PTH = path.dirname(path.realpath(__file__))
|
self._SCRIPT_PTH = path.dirname(path.realpath(__file__))
|
||||||
self._USER_HOME = path.expanduser('~')
|
self._USER_HOME = path.expanduser('~')
|
||||||
self._HOME_CONFIG_PATH = f"{self._USER_HOME}/.config/{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_PATH = f"/usr/share/{APP_NAME.lower()}"
|
||||||
self._USR_CONFIG_FILE = f"{self._USR_PATH}/settings.json"
|
self._USR_CONFIG_FILE = f"{self._USR_PATH}/settings.json"
|
||||||
|
|
||||||
self._CONTEXT_PATH = f"{self._HOME_CONFIG_PATH}/context_path"
|
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._GLADE_FILE = f"{self._HOME_CONFIG_PATH}/Main_Window.glade"
|
||||||
self._CSS_FILE = f"{self._HOME_CONFIG_PATH}/stylesheet.css"
|
self._CSS_FILE = f"{self._HOME_CONFIG_PATH}/stylesheet.css"
|
||||||
self._KEY_BINDINGS_FILE = f"{self._HOME_CONFIG_PATH}/key-bindings.json"
|
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._UI_WIDEGTS_PATH = f"{self._HOME_CONFIG_PATH}/ui_widgets"
|
||||||
self._CONTEXT_MENU = f"{self._HOME_CONFIG_PATH}/contexct_menu.json"
|
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._USR_CONFIG_FILE = f"{self._USR_PATH}/settings.json"
|
||||||
# self._PLUGINS_PATH = f"plugins"
|
# self._PLUGINS_PATH = f"plugins"
|
||||||
|
@ -46,8 +46,8 @@ class SettingsManager(StartCheckMixin, Singleton):
|
||||||
# self._GLADE_FILE = f"Main_Window.glade"
|
# self._GLADE_FILE = f"Main_Window.glade"
|
||||||
# self._CSS_FILE = f"stylesheet.css"
|
# self._CSS_FILE = f"stylesheet.css"
|
||||||
# self._KEY_BINDINGS_FILE = f"key-bindings.json"
|
# self._KEY_BINDINGS_FILE = f"key-bindings.json"
|
||||||
# self._PID_FILE = f"{app_name.lower()}.pid"
|
# self._PID_FILE = f"{APP_NAME.lower()}.pid"
|
||||||
# self._WINDOW_ICON = f"{app_name.lower()}.png"
|
# self._WINDOW_ICON = f"{APP_NAME.lower()}.png"
|
||||||
# self._UI_WIDEGTS_PATH = f"ui_widgets"
|
# self._UI_WIDEGTS_PATH = f"ui_widgets"
|
||||||
# self._CONTEXT_MENU = f"contexct_menu.json"
|
# self._CONTEXT_MENU = f"contexct_menu.json"
|
||||||
# self._DEFAULT_ICONS = f"icons"
|
# self._DEFAULT_ICONS = f"icons"
|
||||||
|
@ -79,7 +79,7 @@ class SettingsManager(StartCheckMixin, Singleton):
|
||||||
if not path.exists(self._CSS_FILE):
|
if not path.exists(self._CSS_FILE):
|
||||||
raise MissingConfigError("Unable to find the application Stylesheet file.")
|
raise MissingConfigError("Unable to find the application Stylesheet file.")
|
||||||
if not path.exists(self._WINDOW_ICON):
|
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):
|
if not path.exists(self._WINDOW_ICON):
|
||||||
raise MissingConfigError("Unable to find the application icon.")
|
raise MissingConfigError("Unable to find the application icon.")
|
||||||
if not path.exists(self._UI_WIDEGTS_PATH):
|
if not path.exists(self._UI_WIDEGTS_PATH):
|
||||||
|
|
|
@ -39,4 +39,4 @@ class WebkitUISettings(WebKit2.Settings):
|
||||||
self.set_enable_webaudio(True)
|
self.set_enable_webaudio(True)
|
||||||
self.set_enable_accelerated_2d_canvas(True)
|
self.set_enable_accelerated_2d_canvas(True)
|
||||||
|
|
||||||
self.set_user_agent(f"{app_name}")
|
self.set_user_agent(f"{APP_NAME}")
|
|
@ -41,7 +41,7 @@ class StartCheckMixin:
|
||||||
try:
|
try:
|
||||||
os.kill(pid, 0)
|
os.kill(pid, 0)
|
||||||
except OSError:
|
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
|
self._dirty_start = True
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
@ -53,7 +53,7 @@ class StartCheckMixin:
|
||||||
self._print_pid(pid)
|
self._print_pid(pid)
|
||||||
|
|
||||||
def _print_pid(self, pid):
|
def _print_pid(self, pid):
|
||||||
print(f"{app_name} PID: {pid}")
|
print(f"{APP_NAME} PID: {pid}")
|
||||||
|
|
||||||
def _clean_pid(self):
|
def _clean_pid(self):
|
||||||
os.unlink(self._PID_FILE)
|
os.unlink(self._PID_FILE)
|
||||||
|
|
Loading…
Reference in New Issue