xtn-tools-pro 1.0.1.2.6__py3-none-any.whl → 1.0.1.2.8__py3-none-any.whl

xtn_tools_pro/task_pro/go_fun_v3.py

@@ -161,19 +161,19 @@ class GoFunTaskV3:
                 f"主线程正常...进程数:{len(go_process_list)}...gofun(True不存在|False正常):{self.manager_info['gofun_kill_status']}...qz:{self.manager_info['gofun_kill_status_qz']}")
             time.sleep(10)
 
-    def __get_external_ip(self):
+    def __get_external_ip(self, retry_cnt=10):
         """
             获取当前网络ip
         :return:
         """
-        for _ in range(10):
+        for _ in range(retry_cnt):
             try:
                 rp = requests.get('https://httpbin.org/ip')
                 rp_json = rp.json()
                 self.logger.warning(f"当前网络ip --> {rp_json}")
                 return rp_json['origin']
             except Exception as e:
-                self.logger.critical(f"获取当前网络ip{e}")
+                self.logger.critical(f"[重试{_ + 1}/{retry_cnt}]获取当前网络ip报错:{e}")
         return "0.0.0.0"
 
     def __download_task(self, download_queue, manager_info, ini_info, logger):

xtn_tools_pro/utils/crypto.py

@@ -174,7 +174,8 @@ def get_2FA(secret, interval=30):
     :param interval:有效期 单位秒
     :return:
     """
-    totp = pyotp.TOTP(secret, interval=interval)
+    base32_secret = base64.b32encode(secret.encode()).decode()
+    totp = pyotp.TOTP(base32_secret, interval=interval)
     return str(totp.now())
 
 
@@ -194,4 +195,4 @@ class A8:
 
 
 if __name__ == '__main__':
-    print(get_2FA('ninqzrh367u3iahpi2mum36bgfvouv5m',3600))
+    print(get_2FA('mzhiahagaghsafsdgfrhfaghfkmzh123456',3600))

xtn_tools_pro/utils/set_data.py

@@ -93,6 +93,7 @@ class PSetDataObj:
                         line = line_i.strip()
                         seen_list.append(line)
                     seen_list = list(set(seen_list))
+                    if not seen_list: continue
                     w_txt = "\n".join(seen_list)
                     f_w.write(w_txt + "\n")
                 os.remove(shard_path)  # 删除临时文件
@@ -159,6 +160,7 @@ class PSetDataObj:
                         line = line_i.strip()
                         seen_list.append(line)
                     seen_list = list(set(seen_list))
+                    if not seen_list: continue
                     w_txt = "\n".join(seen_list)
                     f_w.write(w_txt + "\n")
                 os.remove(shard_path)  # 删除临时文件
@@ -225,6 +227,7 @@ class PSetDataObj:
                         b_seen_list.append(line)
 
                 seen_list = list(set(a_seen_list) - set(b_seen_list))
+                if not seen_list: continue
                 w_txt = "\n".join(seen_list)
                 result_f_w.write(w_txt + "\n")
                 os.remove(a_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.6.dist-info → xtn_tools_pro-1.0.1.2.8.dist-info}/METADATA

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

{xtn_tools_pro-1.0.1.2.6.dist-info → xtn_tools_pro-1.0.1.2.8.dist-info}/RECORD

@@ -51,21 +51,21 @@ xtn_tools_pro/task_pro/__init__.py,sha256=nK3U47hWwE1H875ieEToH9r-jzXHS-PXk8cDst
 xtn_tools_pro/task_pro/go_fun.py,sha256=hWEt2uJ9FCvJH7PhVZttS-11A7J6zbRKwX7c5YLYQag,19144
 xtn_tools_pro/task_pro/go_fun_air_v1.py,sha256=25gHmW5aAV6nMY9Y6-wD7uQ_wqE39dr-eaegqVbYKM8,11035
 xtn_tools_pro/task_pro/go_fun_v2.py,sha256=SgcXgtEBGSVL1V2LyqO0z8Md2H8JZxucYrLLIwqtiLM,18489
-xtn_tools_pro/task_pro/go_fun_v3.py,sha256=_I92M7ubCknrgNfVe9PDw8KbSaqM3DgOPnurGVbRAf4,20807
+xtn_tools_pro/task_pro/go_fun_v3.py,sha256=GI1OVup-izwDflAaoy_pN6xmCXat59II7v-MooOtDms,20862
 xtn_tools_pro/utils/__init__.py,sha256=I1_n_NP23F2lBqlF4EOlnOdLYxM8M4pbn63UhJN1hRE,418
 xtn_tools_pro/utils/audio_video.py,sha256=3Im3tGOW6IbmqDcrE1SJUg6eGyLGEyq11Qu6TCutJJw,1115
-xtn_tools_pro/utils/crypto.py,sha256=kjbmkH6oj3guegDyzD6aW8rDOpKhApma1VnQN02KfcE,5157
+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/retry.py,sha256=0wjHsR5DBBKpv4naMfxiky8kprrZes4WURIfFQ4H708,1657
-xtn_tools_pro/utils/set_data.py,sha256=BzCLbEDO83csDHBey8kP7SoE6kx6EjqE7OqRBY7k82s,17608
+xtn_tools_pro/utils/set_data.py,sha256=TFPIHRZq0d5lkctr3b8lWr56hWAgagPsOwC2-VlHm8g,17782
 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.6.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.1.2.6.dist-info/METADATA,sha256=-29b6WhWWVpz32c9_NRlpK2q9LWacucoN0-X14Odn94,574
-xtn_tools_pro-1.0.1.2.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.1.2.6.dist-info/entry_points.txt,sha256=t8CtXWOgw7nRDW3XNlZh8MT_P4l8EzsFnyWi5b3ovrc,68
-xtn_tools_pro-1.0.1.2.6.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.1.2.6.dist-info/RECORD,,
+xtn_tools_pro-1.0.1.2.8.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.1.2.8.dist-info/METADATA,sha256=YpC4G5dUPZDOEW50nbOgITAUkJ4dP_j55ghY22QP8dc,574
+xtn_tools_pro-1.0.1.2.8.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.1.2.8.dist-info/entry_points.txt,sha256=t8CtXWOgw7nRDW3XNlZh8MT_P4l8EzsFnyWi5b3ovrc,68
+xtn_tools_pro-1.0.1.2.8.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.1.2.8.dist-info/RECORD,,