xtn-tools-pro 1.0.1.2.6__tar.gz → 1.0.1.2.8__tar.gz

{xtn-tools-pro-1.0.1.2.6/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.1.2.8}/PKG-INFO

@@ -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 → xtn-tools-pro-1.0.1.2.8}/setup.py

@@ -15,7 +15,7 @@ with open("README.md", "r") as f:
 
 setuptools.setup(
     name="xtn-tools-pro",  # 模块名称
-    version="1.0.1.2.6",  # 版本
+    version="1.0.1.2.8",  # 版本
     author="xtn",  # 作者
     author_email="czw011122@gmail.com",  # 作者邮箱
     description="xtn 开发工具",  # 模块简介

{xtn-tools-pro-1.0.1.2.6 → xtn-tools-pro-1.0.1.2.8}/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-1.0.1.2.6 → xtn-tools-pro-1.0.1.2.8}/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-1.0.1.2.6 → xtn-tools-pro-1.0.1.2.8}/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 → xtn-tools-pro-1.0.1.2.8/xtn_tools_pro.egg-info}/PKG-INFO

@@ -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