From 3885405366a1788043a6da7f8c284d1773247177 Mon Sep 17 00:00:00 2001 From: dw-0 Date: Sun, 5 May 2024 15:08:24 +0200 Subject: [PATCH] feat: implement conversion of camel case to kebab case Signed-off-by: Dominik Willner --- kiauh/core/instance_manager/base_instance.py | 4 +++- kiauh/core/instance_manager/instance_manager.py | 4 +++- kiauh/utils/common.py | 6 +++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/kiauh/core/instance_manager/base_instance.py b/kiauh/core/instance_manager/base_instance.py index 8655258..a2ab9a5 100644 --- a/kiauh/core/instance_manager/base_instance.py +++ b/kiauh/core/instance_manager/base_instance.py @@ -140,7 +140,9 @@ class BaseInstance(ABC): _dir.mkdir(exist_ok=True) def get_service_file_name(self, extension: bool = False) -> str: - name = f"{self.__class__.__name__.lower()}" + from utils.common import convert_camelcase_to_kebabcase + + name = convert_camelcase_to_kebabcase(self.__class__.__name__) if self.suffix != "": name += f"-{self.suffix}" diff --git a/kiauh/core/instance_manager/instance_manager.py b/kiauh/core/instance_manager/instance_manager.py index a4cf768..05d8197 100644 --- a/kiauh/core/instance_manager/instance_manager.py +++ b/kiauh/core/instance_manager/instance_manager.py @@ -174,7 +174,9 @@ class InstanceManager: raise def find_instances(self) -> List[T]: - name = self.instance_type.__name__.lower() + from utils.common import convert_camelcase_to_kebabcase + + name = convert_camelcase_to_kebabcase(self.instance_type.__name__) pattern = re.compile(f"^{name}(-[0-9a-zA-Z]+)?.service$") excluded = self.instance_type.blacklist() diff --git a/kiauh/utils/common.py b/kiauh/utils/common.py index aae434e..1d567a3 100644 --- a/kiauh/utils/common.py +++ b/kiauh/utils/common.py @@ -6,7 +6,7 @@ # # # This file may be distributed under the terms of the GNU GPLv3 license # # ======================================================================= # - +import re from datetime import datetime from pathlib import Path from typing import Dict, Literal, List, Type, Union @@ -30,6 +30,10 @@ from utils.sys_utils import ( ) +def convert_camelcase_to_kebabcase(name: str) -> str: + return re.sub(r"(? Dict[Literal["date", "time"], str]: """ Get the current date |