xtn-tools-pro 1.0.1.2.7__py3-none-any.whl → 1.0.1.3.0__py3-none-any.whl

xtn_tools_pro/utils/log.py

@@ -118,7 +118,7 @@ class Log:
             # 记录当前的日期，用于之后检查日期是否已经改变
             self.current_date = get_time_timestamp_to_datestr(format="%Y_%m_%d")
             # 记录日志文件的路径模板，用于之后创建新的日志文件
-            self.path_template = f"logs/{{date}}/{name}.log"
+            self.path_template = f"{path}/logs/{{date}}/{name}.log"
             path = self.path_template.format(date=self.current_date)
             # print(path)
             if is_write_to_file:

xtn_tools_pro/utils/set_data.py

@@ -93,8 +93,9 @@ class PSetDataObj:
                         line = line_i.strip()
                         seen_list.append(line)
                     seen_list = list(set(seen_list))
-                    w_txt = "\n".join(seen_list)
-                    f_w.write(w_txt + "\n")
+                    if seen_list:
+                        w_txt = "\n".join(seen_list)
+                        f_w.write(w_txt + "\n")
                 os.remove(shard_path)  # 删除临时文件
 
         with open(result_w_path, "r", encoding="utf-8") as fp_r:
@@ -159,8 +160,9 @@ class PSetDataObj:
                         line = line_i.strip()
                         seen_list.append(line)
                     seen_list = list(set(seen_list))
-                    w_txt = "\n".join(seen_list)
-                    f_w.write(w_txt + "\n")
+                    if seen_list:
+                        w_txt = "\n".join(seen_list)
+                        f_w.write(w_txt + "\n")
                 os.remove(shard_path)  # 删除临时文件
 
         with open(result_w_path, "r", encoding="utf-8") as fp_r:
@@ -225,8 +227,9 @@ class PSetDataObj:
                         b_seen_list.append(line)
 
                 seen_list = list(set(a_seen_list) - set(b_seen_list))
-                w_txt = "\n".join(seen_list)
-                result_f_w.write(w_txt + "\n")
+                if seen_list:
+                    w_txt = "\n".join(seen_list)
+                    result_f_w.write(w_txt + "\n")
                 os.remove(a_shard_path)  # 删除临时文件
                 os.remove(b_shard_path)  # 删除临时文件
 
@@ -349,5 +352,6 @@ class PSetDataObj:
         :param data_list:
         :return:
         """
+        if not data_list: return
         with open(file_w_path, "w", encoding="utf-8") as result_w_f:
             result_w_f.write("\n".join(data_list))

{xtn_tools_pro-1.0.1.2.7.dist-info → xtn_tools_pro-1.0.1.3.0.dist-info}/METADATA

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

{xtn_tools_pro-1.0.1.2.7.dist-info → xtn_tools_pro-1.0.1.3.0.dist-info}/RECORD

@@ -57,15 +57,15 @@ xtn_tools_pro/utils/audio_video.py,sha256=3Im3tGOW6IbmqDcrE1SJUg6eGyLGEyq11Qu6TC
 xtn_tools_pro/utils/crypto.py,sha256=B6NC2yVxtwrbSZnngudTFRm7YRGKKEusydVVYWwxFHs,5231
 xtn_tools_pro/utils/file_utils.py,sha256=vsUgds8I8Z2pL9a4oCv1q0JrZsDP29qLyLyGVqj5sX8,3311
 xtn_tools_pro/utils/helpers.py,sha256=0CTMY7wfSQR_DC9-v1lkKQLpWcB1FL9V_kw_5DOcZ40,4454
-xtn_tools_pro/utils/log.py,sha256=DTUWwi5pvZrwwq94odGnR0JBhfStrc6SxcJREqf2Ls4,11031
+xtn_tools_pro/utils/log.py,sha256=MPT9q1keNYroaw6U9a-Gc0iT0ceUEVTI-Tz2GEiWLUc,11038
 xtn_tools_pro/utils/retry.py,sha256=0wjHsR5DBBKpv4naMfxiky8kprrZes4WURIfFQ4H708,1657
-xtn_tools_pro/utils/set_data.py,sha256=BzCLbEDO83csDHBey8kP7SoE6kx6EjqE7OqRBY7k82s,17608
+xtn_tools_pro/utils/set_data.py,sha256=UR5S8xBqc4Vk8zpbrNVsxKhwaBAenaEdC7O-N3s7haw,17767
 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.2.7.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.1.2.7.dist-info/METADATA,sha256=I2mLciYo33AHWAu3H-YbG1__tOxEAfNeIhkAlMKAXkE,574
-xtn_tools_pro-1.0.1.2.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.1.2.7.dist-info/entry_points.txt,sha256=t8CtXWOgw7nRDW3XNlZh8MT_P4l8EzsFnyWi5b3ovrc,68
-xtn_tools_pro-1.0.1.2.7.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.1.2.7.dist-info/RECORD,,
+xtn_tools_pro-1.0.1.3.0.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.1.3.0.dist-info/METADATA,sha256=43e7Vi5-dnn6wCUNT4esYBCOa2Dc68jFNXcuM-siDfY,574
+xtn_tools_pro-1.0.1.3.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.1.3.0.dist-info/entry_points.txt,sha256=t8CtXWOgw7nRDW3XNlZh8MT_P4l8EzsFnyWi5b3ovrc,68
+xtn_tools_pro-1.0.1.3.0.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.1.3.0.dist-info/RECORD,,