ezKit 1.10.2__py3-none-any.whl → 1.10.4__py3-none-any.whl

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
@@ -1229,7 +1228,7 @@ def processor(
         _data_chunks = (
             list_split(process_data, process_num, equally=True)
             if process_num > 1
-            else process_data
+            else [process_data]
         )
 
         if not _data_chunks:

{ezKit-1.10.2.dist-info → ezKit-1.10.4.dist-info}/METADATA

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

{ezKit-1.10.2.dist-info → ezKit-1.10.4.dist-info}/RECORD

@@ -9,10 +9,10 @@ ezKit/qywx.py,sha256=X_H4fzP-iEqeDEbumr7D1bXi6dxczaxfO8iyutzy02s,7171
 ezKit/redis.py,sha256=g2_V4jvq0djRc20jLZkgeAeF_bYrq-Rbl_kHcCUPZcA,1965
 ezKit/sendemail.py,sha256=tRXCsJm_RfTJ9xEWe_lTQ5kOs2JxHGPXvq0oWA7prq0,7263
 ezKit/token.py,sha256=HKREyZj_T2S8-aFoFIrBXTaCKExQq4zE66OHXhGHqQg,1750
-ezKit/utils.py,sha256=xfubEO3tMaPp9idKst-xwdSuSTtRQfsO-k9FlipnHT4,42515
+ezKit/utils.py,sha256=ILLaptYUSalERbCOhmoq4w0ZNZgj9yurpHEZwjRMZ8w,42387
 ezKit/xftp.py,sha256=XyIdr_2rxRVLqPofG6fIYWhAMVsFwTyp46dg5P9FLW4,7774
-ezKit-1.10.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezKit-1.10.2.dist-info/METADATA,sha256=BHUZCWlCgc_I0J4s2LbKakrUWMJALLqvIGAm2g0QEww,191
-ezKit-1.10.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ezKit-1.10.2.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezKit-1.10.2.dist-info/RECORD,,
+ezKit-1.10.4.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezKit-1.10.4.dist-info/METADATA,sha256=uH8X29vT0V5J3nwzW7pwMvgor45UyDqw_1iGCwU_9A4,191
+ezKit-1.10.4.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ezKit-1.10.4.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezKit-1.10.4.dist-info/RECORD,,