From e63eb47ee93f93c5785cb7712aab835222b87a01 Mon Sep 17 00:00:00 2001 From: dw-0 Date: Sat, 22 Jun 2024 10:58:43 +0200 Subject: [PATCH] refactor: extract config filenames into constants Signed-off-by: Dominik Willner --- default_kiauh.cfg => default.kiauh.cfg | 0 kiauh/core/settings/kiauh_settings.py | 15 +++++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) rename default_kiauh.cfg => default.kiauh.cfg (100%) diff --git a/default_kiauh.cfg b/default.kiauh.cfg similarity index 100% rename from default_kiauh.cfg rename to default.kiauh.cfg diff --git a/kiauh/core/settings/kiauh_settings.py b/kiauh/core/settings/kiauh_settings.py index eada99d..a00996d 100644 --- a/kiauh/core/settings/kiauh_settings.py +++ b/kiauh/core/settings/kiauh_settings.py @@ -8,7 +8,6 @@ # ======================================================================= # from __future__ import annotations -import textwrap from typing import Union from core.submodules.simple_config_parser.src.simple_config_parser.simple_config_parser import ( @@ -16,12 +15,14 @@ from core.submodules.simple_config_parser.src.simple_config_parser.simple_config NoSectionError, SimpleConfigParser, ) -from utils.constants import COLOR_RED, RESET_FORMAT -from utils.logger import Logger +from utils.logger import DialogType, Logger from utils.sys_utils import kill from kiauh import PROJECT_ROOT +DEFAULT_CFG = PROJECT_ROOT.joinpath("default.kiauh.cfg") +CUSTOM_CFG = PROJECT_ROOT.joinpath("kiauh.cfg") + class AppSettings: def __init__(self) -> None: @@ -56,8 +57,6 @@ class FluiddSettings: # noinspection PyMethodMayBeStatic class KiauhSettings: _instance = None - _default_cfg = PROJECT_ROOT.joinpath("default_kiauh.cfg") - _custom_cfg = PROJECT_ROOT.joinpath("kiauh.cfg") def __new__(cls, *args, **kwargs) -> "KiauhSettings": if cls._instance is None: @@ -120,14 +119,14 @@ class KiauhSettings: def save(self) -> None: self._set_config_options() - self.config.write(self._custom_cfg) + self.config.write(CUSTOM_CFG) self._load_config() def _load_config(self) -> None: - if not self._custom_cfg.exists() and not self._default_cfg.exists(): + if not CUSTOM_CFG.exists() or not DEFAULT_CFG.exists(): self._kill() - cfg = self._custom_cfg if self._custom_cfg.exists() else self._default_cfg + cfg = CUSTOM_CFG if CUSTOM_CFG.exists() else DEFAULT_CFG self.config.read(cfg) self._validate_cfg()