ezKit 1.10.3__tar.gz → 1.10.4__tar.gz

{ezkit-1.10.3/ezKit.egg-info → ezkit-1.10.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ezKit
-Version: 1.10.3
+Version: 1.10.4
 Summary: Easy Kit
 Author: septvean
 Author-email: septvean@gmail.com

{ezkit-1.10.3 → ezkit-1.10.4}/ezKit/utils.py

@@ -13,7 +13,7 @@ from multiprocessing import Pool
 from multiprocessing.pool import ThreadPool
 from pathlib import Path
 from shutil import rmtree
-from typing import Any, Callable, List, Union
+from typing import Any, Callable, List, Optional, Union
 from urllib.parse import ParseResult, urlparse
 from uuid import uuid4
 
@@ -1001,46 +1001,45 @@ def datetime_object(
 # --------------------------------------------------------------------------------------------------
 
 
-# run_cmd = bash('echo ok', universal_newlines=True, stdout=PIPE)
-#
-# if run_cmd != None:
-#     returncode = run_cmd.returncode
-#     outputs = run_cmd.stdout.splitlines()
-#     print(returncode, type(returncode))
-#     print(outputs, type(outputs))
-#
-# # echo 'echo ok' > /tmp/ok.sh
-# run_script = bash('/tmp/ok.sh', file=True, universal_newlines=True, stdout=PIPE)
-#
-# if run_script != None:
-#     returncode = run_script.returncode
-#     outputs = run_script.stdout.splitlines()
-#     print(returncode, type(returncode))
-#     print(outputs, type(outputs))
-
-
 def shell(
     command: str,
     isfile: bool = False,
-    sh_shell: str = '/bin/bash',
-    sh_option: str | None = None,
+    sh_shell: str = "/bin/bash",
+    sh_option: Optional[str] = None,
     **kwargs
-) -> subprocess.CompletedProcess | None:
-    """run shell command or script"""
+) -> Optional[subprocess.CompletedProcess]:
+    """执行 Shell 命令 或 脚本"""
+
+    # :param command: 需要执行的命令
+    # :param isfile: 是否将命令视为文件路径
+    # :param sh_shell: 使用的 Shell 程序路径
+    # :param sh_option: Shell 执行选项，例如 '-c'
+    # :param kwargs: 其他传递给 subprocess.run 的参数
+    # :return: 返回 subprocess.CompletedProcess 对象，失败时返回 None
+
     try:
-        match True:
-            case True if not check_file_type(sh_shell, 'file'):
-                return None
-            case True if isTrue(sh_shell, str) and isTrue(command, str):
-                if isfile is True:
-                    if sh_option is None:
-                        return subprocess.run([sh_shell, command], **kwargs, check=False)
-                    return subprocess.run([sh_shell, sh_option, command], **kwargs, check=False)
-                if sh_option is None:
-                    sh_option = '-c'
-                return subprocess.run([sh_shell, sh_option, command], **kwargs, check=False)
-            case _:
-                return None
+
+        # 校验 Shell 程序路径
+        if not check_file_type(sh_shell, "file"):
+            logger.error(f"Invalid shell path: {sh_shell}")
+            return None
+
+        # 校验 command 和 sh_shell 的类型
+        if not (isTrue(sh_shell, str) and isTrue(command, str)):
+            logger.error("Invalid shell or command input.")
+            return None
+
+        # 构造命令
+        if isfile:
+            args = [sh_shell, command] if sh_option is None else [sh_shell, sh_option, command]
+        else:
+            sh_option = sh_option or "-c"
+            args = [sh_shell, sh_option, command]
+
+        logger.info(f"Executing command: {args}")
+
+        return subprocess.run(args, **kwargs, check=False)
+
     except Exception as e:
         logger.exception(e)
         return None

{ezkit-1.10.3 → ezkit-1.10.4/ezKit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ezKit
-Version: 1.10.3
+Version: 1.10.4
 Summary: Easy Kit
 Author: septvean
 Author-email: septvean@gmail.com

{ezkit-1.10.3 → ezkit-1.10.4}/setup.py

@@ -3,7 +3,7 @@ from setuptools import find_packages, setup
 
 setup(
     name='ezKit',
-    version='1.10.3',
+    version='1.10.4',
     author='septvean',
     author_email='septvean@gmail.com',
     description='Easy Kit',