arpakitlib 1.6.72__tar.gz → 1.6.75__tar.gz

{arpakitlib-1.6.72 → arpakitlib-1.6.75}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arpakitlib
-Version: 1.6.72
+Version: 1.6.75
 Summary: arpakitlib
 Home-page: https://github.com/ARPAKIT-Company/arpakitlib
 License: Apache-2.0

arpakitlib-1.6.75/arpakitlib/_ar_arpakitlib_cli.py

@@ -0,0 +1,52 @@
+# arpakit
+
+import sys
+
+from arpakitlib.ar_need_type_util import parse_need_type, NeedTypes
+from arpakitlib.ar_parse_command import parse_command
+from arpakitlib.ar_project_template_util import init_arpakit_project_template
+from arpakitlib.ar_str_util import raise_if_blank
+
+
+def _arpakitlib_cli(*, full_command: str | None = None):
+    if full_command is None:
+        full_command = " ".join(sys.argv)
+
+    parsed_command = parse_command(text=full_command)
+    parsed_command.raise_for_command(needed_command="arpakitlib", lower_=True)
+
+    command = parsed_command.get_value_by_keys(keys=["command", "c"])
+    if command:
+        command = command.strip()
+    if not command:
+        raise Exception(f"not command, command={command}")
+
+    if command == "help":
+        print(
+            "Commands:"
+            "\n- init_arpakit_project_template"
+            " (project_dirpath, remove_if_exists, project_name, ignore_src_dir, ignore_manage_dir)"
+        )
+
+    elif command == "init_arpakit_project_template":
+        project_dirpath = raise_if_blank(parsed_command.get_value_by_keys(keys=["pd", "project_dirpath"]))
+        overwrite_if_exists: bool = parse_need_type(
+            value=parsed_command.get_value_by_keys(keys=["oie", "overwrite_if_exists"]),
+            need_type=NeedTypes.bool_
+        )
+        project_name: str = parsed_command.get_value_by_keys(keys=["pm", "project_name"])
+        ignore_paths_startswith: list[str] | None = parse_need_type(
+            value=parsed_command.get_value_by_keys(keys=["ipsw", "ignore_paths_startswith"]),
+            need_type=NeedTypes.list_of_str
+        )
+        init_arpakit_project_template(
+            project_dirpath=project_dirpath, overwrite_if_exists=overwrite_if_exists, project_name=project_name,
+            ignore_paths_startswith=ignore_paths_startswith
+        )
+
+    else:
+        raise Exception(f"not recognized command, command={command}")
+
+
+if __name__ == '__main__':
+    _arpakitlib_cli(full_command="/arpakitlib -c help")

{arpakitlib-1.6.72 → arpakitlib-1.6.75}/arpakitlib/ar_parse_command.py

@@ -1,5 +1,5 @@
 # arpakit
-
+import os
 import shlex
 
 from pydantic import BaseModel
@@ -15,6 +15,7 @@ class BadCommandFormat(Exception):
 
 class ParsedCommand(BaseModel):
     command: str
+    full_command: str
     key_to_value: dict[str, str | None] = {}
     values_without_key: list[str] = []
 
@@ -67,6 +68,7 @@ class ParsedCommand(BaseModel):
 
 
 def parse_command(text: str) -> ParsedCommand:
+    text = text.removeprefix("/")
     text = " ".join([text_.strip() for text_ in text.split(" ") if text_.strip()]).strip()
 
     parts = shlex.split(text)
@@ -75,7 +77,7 @@ def parse_command(text: str) -> ParsedCommand:
     if len(parts[0]) == 1:
         raise BadCommandFormat("len(parts[0]) == 1")
 
-    res = ParsedCommand(command=parts[0])
+    res = ParsedCommand(full_command=parts[0], command=os.path.basename(parts[0]).removeprefix("/"))
 
     last_key: str | None = None
     for part in parts[1:]:

arpakitlib-1.6.75/arpakitlib/ar_project_template_util.py

@@ -0,0 +1,62 @@
+# arpakit
+
+import logging
+import os
+
+from arpakitlib.ar_str_util import make_none_if_blank
+
+_ARPAKIT_LIB_MODULE_VERSION = "3.0"
+
+_logger = logging.getLogger(__name__)
+
+
+def init_arpakit_project_template(
+        *,
+        project_dirpath: str,
+        overwrite_if_exists: bool = False,
+        project_name: str | None = None,
+        ignore_paths_startswith: list[str] | str | None = None
+):
+    if project_name:
+        project_name = project_name.strip()
+    project_name = make_none_if_blank(project_name)
+
+    if isinstance(ignore_paths_startswith, str):
+        ignore_paths_startswith = [ignore_paths_startswith]
+    if ignore_paths_startswith is None:
+        ignore_paths_startswith = []
+
+    def _generate_filepath_to_content() -> dict[str, str]:
+        arpakit_project_template_dirpath = os.path.abspath("_arpakit_project_template")
+        res = {}
+        for root, dirs, files in os.walk(arpakit_project_template_dirpath):
+            dirs[:] = [d for d in dirs if d != '__pycache__']
+            for file in files:
+                rel_path = os.path.relpath(os.path.join(root, file), arpakit_project_template_dirpath)
+                if any(rel_path.startswith(ignore_path) for ignore_path in ignore_paths_startswith):
+                    _logger.info(f"Ignoring file: {rel_path}")
+                    continue
+                with open(os.path.join(root, file), "r", encoding='utf-8') as _file:
+                    _content = _file.read()
+                if project_name:
+                    _content = _content.replace("{PROJECT_NAME}", project_name)
+                res[rel_path] = _content
+        return res
+
+    filepath_to_content = _generate_filepath_to_content()
+
+    if not os.path.exists(project_dirpath):
+        os.makedirs(project_dirpath)
+
+    for filepath, content in filepath_to_content.items():
+        full_filepath = os.path.join(project_dirpath, filepath)
+
+        if os.path.exists(full_filepath) and not overwrite_if_exists:
+            _logger.info(f"file exists and overwrite_if_exists is False, skipping: {full_filepath}")
+            continue
+
+        _logger.info(f"creating file: {full_filepath}")
+        os.makedirs(os.path.dirname(full_filepath), exist_ok=True)
+        with open(full_filepath, "w", encoding="utf-8") as file_:
+            file_.write(content)
+        _logger.info(f"file created: {full_filepath}")

{arpakitlib-1.6.72 → arpakitlib-1.6.75}/arpakitlib/ar_str_util.py

@@ -52,12 +52,18 @@ def bidirectional_str_startswith(string1: str, string2: str, max_diff: Optional[
     return False
 
 
-def blank_if_none(string: Optional[str] = None) -> str:
+def make_blank_if_none(string: Optional[str] = None) -> str:
     if string is None:
         return ""
     return string
 
 
+def make_none_if_blank(string: Optional[str] = None) -> str:
+    if not string:
+        return None
+    return string
+
+
 def remove_html(string: str) -> str:
     raise_for_type(string, str)
     return BeautifulSoup(string, "html.parser").text
@@ -73,7 +79,7 @@ def remove_tags_and_html(string: str) -> str:
     return remove_tags(remove_html(string))
 
 
-def raise_if_string_blank(string: str) -> str:
+def raise_if_blank(string: str) -> str:
     if not string:
         raise ValueError("not string")
     return string

{arpakitlib-1.6.72 → arpakitlib-1.6.75}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arpakitlib"
-version = "1.6.72"
+version = "1.6.75"
 description = "arpakitlib"
 authors = ["arpakit <arpakit@gmail.com>", "arpakit_support <support@arpakit.com>"]
 license = "Apache License 2.0"

arpakitlib-1.6.72/arpakitlib/_ar_arpakitlib_cli.py

@@ -1,51 +0,0 @@
-# arpakit
-
-import logging
-import sys
-
-from arpakitlib.ar_need_type_util import parse_need_type, NeedTypes
-from arpakitlib.ar_parse_command import parse_command
-from arpakitlib.ar_project_template_util import init_arpakit_project_template
-from arpakitlib.ar_str_util import raise_if_string_blank
-
-_logger = logging.getLogger(__name__)
-
-
-def _arpakitlib_cli(*, full_command: str):
-    _logger.info("start _arpakitlib_cli")
-
-    parsed_command = parse_command(text=full_command)
-    parsed_command.raise_for_command(needed_command="arpakitlib", lower_=True)
-
-    command = parsed_command.get_value_by_keys(keys=["command", "c"])
-    if command:
-        command = command.strip()
-    if not command:
-        raise Exception(f"not command, command={command}")
-
-    _logger.info(f"start {command}")
-
-    if command == "help":
-        pass
-
-    elif command == "init_arpakit_project_template":
-        project_dirpath = raise_if_string_blank(parsed_command.get_value_by_keys(keys=["pd", "project_dirpath"]))
-        remove_if_exists: bool = parse_need_type(
-            value=parsed_command.get_value_by_keys(keys=["rie", "remove_if_exists"]),
-            need_type=NeedTypes.bool_
-        )
-        project_name = raise_if_string_blank(parsed_command.get_value_by_keys(keys=["pm", "project_name"]))
-        init_arpakit_project_template(
-            project_dirpath=project_dirpath, remove_if_exists=remove_if_exists, project_name=project_name
-        )
-
-    else:
-        raise Exception(f"not recognized command, command={command}")
-
-    _logger.info(f"finish {command}")
-
-    _logger.info("finish _arpakitlib_cli")
-
-
-if __name__ == '__main__':
-    _arpakitlib_cli(full_command=" ".join(sys.argv))

arpakitlib-1.6.72/arpakitlib/ar_project_template_util.py

@@ -1,55 +0,0 @@
-# arpakit
-import logging
-import os
-
-from arpakitlib.ar_file_util import raise_if_path_not_exists
-
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
-_logger = logging.getLogger(__name__)
-
-
-def init_arpakit_project_template(
-        *, project_dirpath: str, remove_if_exists: bool = False, project_name: str | None = None
-):
-    if project_name:
-        project_name = project_name.strip()
-    if not project_name:
-        project_name = None
-
-    source_template_dirpath = os.path.join(os.path.dirname(__file__), "_arpakit_project_template")
-
-    raise_if_path_not_exists(path=source_template_dirpath)
-
-    project_dirpath = os.path.abspath(project_dirpath)
-
-    filepath_to_content = {}
-
-    for root_filepath, dir_filepaths, file_filepaths in os.walk(source_template_dirpath):
-        dir_filepaths[:] = [d for d in dir_filepaths if d != "__pycache__"]
-        relative_filepath = os.path.relpath(root_filepath, source_template_dirpath)
-        target_root_filepath = os.path.normpath(os.path.join(project_dirpath, relative_filepath))
-        for file in file_filepaths:
-            source_file_filepath = os.path.join(root_filepath, file)
-            target_file_filepath = os.path.normpath(os.path.join(target_root_filepath, file))
-
-            with open(source_file_filepath, "r", encoding="utf-8") as f:
-                content = f.read()
-
-            if project_name is not None:
-                content = content.replace("{PROJECT_NAME}", project_name)
-
-            filepath_to_content[target_file_filepath] = content
-
-    if not os.path.exists(project_dirpath):
-        os.makedirs(project_dirpath)
-
-    for target_file_filepath, content in filepath_to_content.items():
-        if os.path.exists(target_file_filepath) and not remove_if_exists:
-            _logger.info(f"skip existing file: {target_file_filepath}")
-            continue
-        _logger.info(f"initing file: {target_file_filepath}")
-        os.makedirs(os.path.dirname(target_file_filepath), exist_ok=True)
-        with open(target_file_filepath, "w", encoding="utf-8") as f:
-            f.write(content)
-        _logger.info(f"file was inited: {target_file_filepath}")