xtn-tools-pro 1.0.1.2.3__tar.gz → 1.0.1.2.5__tar.gz

{xtn-tools-pro-1.0.1.2.3/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.1.2.5}/PKG-INFO

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

{xtn-tools-pro-1.0.1.2.3 → xtn-tools-pro-1.0.1.2.5}/setup.py

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

{xtn-tools-pro-1.0.1.2.3 → xtn-tools-pro-1.0.1.2.5}/xtn_tools_pro/task_pro/go_fun_v3.py

@@ -370,6 +370,33 @@ class GoFunTaskV3:
             self.logger.critical(f"get_download_task 获取下载任务 {self.download_queue, block, timeout} 报错 {e}")
             return False
 
+    def get_download_task_list(self, block=False, timeout=1, get_cnt=1):
+        """
+            获取下载任务
+        :param block: 是否阻塞等待 True阻塞/False不阻塞
+        :param timeout:
+        :param get_cnt: 获取任务的个数
+        :return:
+        error_code:1001 队列为空;
+        """
+        task_item_list = []
+        for _ in range(get_cnt):
+            try:
+                task_item = self.download_queue.get(block=block, timeout=timeout)
+                task_item["success"] = True
+                task_item_list.append(task_item)
+            except queue.Empty as e:
+                # 捕获队列为空的异常
+                # self.logger.info(f"get_download_task 获取下载任务 {download_queue, block, timeout} 报错 队列为空: {e}")
+                # return {"error": "队列为空", "error_code": 1001}
+                break
+            except Exception as e:
+                self.logger.critical(f"get_download_task 获取下载任务 {self.download_queue, block, timeout} 报错 {e}")
+                # return False
+                break
+
+        return task_item_list
+
     def update_upload_task(self, task_item):
         """
             更新任务

{xtn-tools-pro-1.0.1.2.3 → xtn-tools-pro-1.0.1.2.5}/xtn_tools_pro/utils/crypto.py

@@ -167,13 +167,14 @@ def img_str_to_bytes(img_data: str):
     return img_data.encode('latin1')
 
 
-def get_2FA(secret):
+def get_2FA(secret, interval=30):
     """
         计算 2FA
     :param secret:
+    :param interval:有效期 单位秒
     :return:
     """
-    totp = pyotp.TOTP(secret)
+    totp = pyotp.TOTP(secret, interval=interval)
     return str(totp.now())
 
 
@@ -193,4 +194,4 @@ class A8:
 
 
 if __name__ == '__main__':
-    print(get_2FA('ninqzrh367u3iahpi2mum36bgfvouv5m'))
+    print(get_2FA('ninqzrh367u3iahpi2mum36bgfvouv5m',3600))

{xtn-tools-pro-1.0.1.2.3 → xtn-tools-pro-1.0.1.2.5/xtn_tools_pro.egg-info}/PKG-INFO

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