xtn-tools-pro 1.0.1.1.9__py3-none-any.whl → 1.0.1.2.0__py3-none-any.whl

xtn_tools_pro/utils/log.py

@@ -72,6 +72,17 @@ class BoldFormatter(logging.Formatter):
         return "\033[1m" + result + "\033[0m"
 
 
+def get_caller_script_path():
+    # 获取调用栈列表
+    stack = inspect.stack()
+    # 遍历调用栈，找到第一个非本模块的调用者
+    for frame_info in stack:
+        filename = frame_info.filename
+        if filename != __file__:  # 排除日志模块自身的路径
+            return os.path.abspath(filename)
+    return os.path.abspath(__file__)  # 默认返回当前模块路径（理论上不会执行到这里）
+
+
 class Log:
     def __init__(self, name, path=None, log_level='DEBUG',
                  is_write_to_console=True,
@@ -102,13 +113,16 @@ class Log:
         self.logger.setLevel(log_level.upper())
         self.save_time_log_path = save_time_log_path
         if save_time_log_path:
+            # 获取调用文件的所在文件夹路径
+            run_py_path = os.path.dirname(get_caller_script_path())
             # 记录当前的日期，用于之后检查日期是否已经改变
             self.current_date = get_time_timestamp_to_datestr(format="%Y_%m_%d")
             # 记录日志文件的路径模板，用于之后创建新的日志文件
-            self.path_template = self.path_template = f"{save_time_log_path}/{{date}}/{name}.log"
+            self.path_template = f"logs/{{date}}/{name}.log"
             path = self.path_template.format(date=self.current_date)
             if is_write_to_file:
-                mkdirs_dir(self.path_template.format(date=self.current_date))
+                mkdirs_dir_log_path = os.path.join(run_py_path, path)
+                mkdirs_dir(mkdirs_dir_log_path)
 
         # 创建日志格式化器
         # formatter = logging.Formatter('[%(now_datestr)s] [%(levelname)s] [%(func_name)s] - %(message)s') # 原
@@ -229,4 +243,4 @@ if __name__ == '__main__':
     logger.info("info level message")
     logger.warning("warning level message")
     logger.critical("critical level message 你好")
-    time.sleep(1)
+    # time.sleep(1)

{xtn_tools_pro-1.0.1.1.9.dist-info → xtn_tools_pro-1.0.1.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtn-tools-pro
-Version: 1.0.1.1.9
+Version: 1.0.1.2.0
 Summary: xtn 开发工具
 Author: xtn
 Author-email: czw011122@gmail.com

{xtn_tools_pro-1.0.1.1.9.dist-info → xtn_tools_pro-1.0.1.2.0.dist-info}/RECORD

@@ -56,15 +56,15 @@ xtn_tools_pro/utils/__init__.py,sha256=I1_n_NP23F2lBqlF4EOlnOdLYxM8M4pbn63UhJN1h
 xtn_tools_pro/utils/crypto.py,sha256=fyqno82Tw8LeF5i8YiEpjPI3oswsqTeWE5Lc9M2ef68,4603
 xtn_tools_pro/utils/file_utils.py,sha256=obaBP7CaBCsXxzqGeWzV2l0yw7vicgKOaXzmpMV8ips,2567
 xtn_tools_pro/utils/helpers.py,sha256=0CTMY7wfSQR_DC9-v1lkKQLpWcB1FL9V_kw_5DOcZ40,4454
-xtn_tools_pro/utils/log.py,sha256=mf5huJDA8xVxxFWPG_tl_vOsAA2_ywGDFycYSGHIDCo,10202
+xtn_tools_pro/utils/log.py,sha256=V_NNFV6aFlQasj5Ejal2lo18EHWWCSOQiZf54j-Xhkg,10788
 xtn_tools_pro/utils/retry.py,sha256=0wjHsR5DBBKpv4naMfxiky8kprrZes4WURIfFQ4H708,1657
 xtn_tools_pro/utils/set_data.py,sha256=BzCLbEDO83csDHBey8kP7SoE6kx6EjqE7OqRBY7k82s,17608
 xtn_tools_pro/utils/shell.py,sha256=s6sJedxLLQokcI1hF5YSD3qgGUPK0brNcP-D3-yv54I,3790
 xtn_tools_pro/utils/sql.py,sha256=EAKzbkZP7Q09j15Gm6o0_uq0qgQmcCQT6EAawbpp4v0,6263
 xtn_tools_pro/utils/time_utils.py,sha256=TUtzG61PeVYXhaQd6pBrXAdlz7tBispNIRQRcGhE2No,4859
-xtn_tools_pro-1.0.1.1.9.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.1.1.9.dist-info/METADATA,sha256=2j4vwVw6ZR7mAJKz-4XftYVN0qPa6HUd_6qbRq_ZPM4,545
-xtn_tools_pro-1.0.1.1.9.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.1.1.9.dist-info/entry_points.txt,sha256=t8CtXWOgw7nRDW3XNlZh8MT_P4l8EzsFnyWi5b3ovrc,68
-xtn_tools_pro-1.0.1.1.9.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.1.1.9.dist-info/RECORD,,
+xtn_tools_pro-1.0.1.2.0.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.1.2.0.dist-info/METADATA,sha256=Uq-pXRcnCK6soAPHfV2TX7om-AzcQeJQJ8EsLfKs-aY,545
+xtn_tools_pro-1.0.1.2.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.1.2.0.dist-info/entry_points.txt,sha256=t8CtXWOgw7nRDW3XNlZh8MT_P4l8EzsFnyWi5b3ovrc,68
+xtn_tools_pro-1.0.1.2.0.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.1.2.0.dist-info/RECORD,,