ezKit 1.7.3__py3-none-any.whl → 1.7.5__py3-none-any.whl

ezKit/utils.py

@@ -8,6 +8,7 @@ import json
 import os
 import subprocess
 import time
+import tomllib
 from copy import deepcopy
 from multiprocessing import Pool, Process
 from multiprocessing.pool import ThreadPool
@@ -19,7 +20,6 @@ from urllib.parse import ParseResult, urlparse
 from uuid import uuid4
 
 from loguru import logger
-from tomlkit import load as toml_load
 
 # --------------------------------------------------------------------------------------------------
 
@@ -799,14 +799,46 @@ def resolve_path() -> str | None:
     return str(Path().resolve())
 
 
-def parent_path(
+# def parent_path(
+#     path: str,
+#     debug: bool = False,
+#     **kwargs
+# ) -> str | None:
+#     """获取父目录名称"""
+#     try:
+#         return str(Path(path, **kwargs).parent.resolve()) if v_true(path, str, debug=debug) else None
+#     except Exception as e:
+#         if v_true(debug, bool):
+#             logger.exception(e)
+#         return None
+
+
+def current_dir(
     path: str,
     debug: bool = False,
     **kwargs
 ) -> str | None:
-    """获取父目录名称"""
+    """获取当前文件所在目录"""
     try:
-        return str(Path(path, **kwargs).parent.resolve()) if v_true(path, str, debug=debug) else None
+        if v_true(path, str, debug=debug) is False:
+            return None
+        return str(Path(path, **kwargs).parent.resolve())
+    except Exception as e:
+        if v_true(debug, bool):
+            logger.exception(e)
+        return None
+
+
+def parent_dir(
+    path: str,
+    debug: bool = False,
+    **kwargs
+) -> str | None:
+    """获取当前文件所在目录的父目录"""
+    try:
+        if v_true(path, str, debug=debug) is False:
+            return None
+        return str(Path(path, **kwargs).parent.parent.resolve())
     except Exception as e:
         if v_true(debug, bool):
             logger.exception(e)
@@ -1516,7 +1548,7 @@ def load_toml_file(
         if v_true(debug, bool):
             logger.info(f'{info}[执行]')
         with open(file, "rb") as _file:
-            config = toml_load(_file)
+            config = tomllib.load(_file)
         if v_true(debug, bool):
             logger.success(f'{info}[成功]')
         return config

{ezKit-1.7.3.dist-info → ezKit-1.7.5.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: ezKit
-Version: 1.7.3
+Version: 1.7.5
 Summary: Easy Kit
 Author: septvean
 Author-email: septvean@gmail.com
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 License-File: LICENSE

{ezKit-1.7.3.dist-info → ezKit-1.7.5.dist-info}/RECORD

@@ -12,11 +12,11 @@ ezKit/redis.py,sha256=pY4SPlcgQ7S8IeY2xoDpxy-xCZxzZQrQJNAoWRsC1dI,1773
 ezKit/reports.py,sha256=dBBggggCCLuk5YD6SjdUPuxTr3wiJojP3lA7dQfg6Pk,8898
 ezKit/sendemail.py,sha256=AAdxBvEYN_AJVvBkSAvXzhXC5jkbRsD_8P51h2SdTRw,8413
 ezKit/token.py,sha256=4L6A26KsxvB4WfF8R7SYiBmihJK0PiN5Oh7dgDVJtxU,1382
-ezKit/utils.py,sha256=VkZzKy_jupr25Axa5I0juMsm1XiaimyiPoSITA91jcg,47826
+ezKit/utils.py,sha256=rTTQwcgMmYwi-TFBwdr4FiawVuOss59DX1mKdmHDM1M,48616
 ezKit/xftp.py,sha256=qbCqFcGe22TDBSisj0Zoz78tnydDWoOfvywWpXdfaGw,6982
 ezKit/zabbix.py,sha256=soM5UEeYMfm7NczbPOVLirmHm3G20dECQ0aCBttZfhQ,28350
-ezKit-1.7.3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezKit-1.7.3.dist-info/METADATA,sha256=KisYwblMheFnzhCtB9WvgESi3-Z8VsnZ8jJPrw1swGQ,163
-ezKit-1.7.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ezKit-1.7.3.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezKit-1.7.3.dist-info/RECORD,,
+ezKit-1.7.5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezKit-1.7.5.dist-info/METADATA,sha256=hWIBqepDZAuS_xHuQt0C9B5_AbvibiqqUWjW_4icDR0,163
+ezKit-1.7.5.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ezKit-1.7.5.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezKit-1.7.5.dist-info/RECORD,,