xtn-tools-pro 1.0.0.3.2__tar.gz → 1.0.0.3.4__tar.gz

{xtn-tools-pro-1.0.0.3.2/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.0.3.4}/PKG-INFO

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

{xtn-tools-pro-1.0.0.3.2 → xtn-tools-pro-1.0.0.3.4}/setup.py

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

{xtn-tools-pro-1.0.0.3.2 → xtn-tools-pro-1.0.0.3.4}/xtn_tools_pro/task_pro/go_fun.py

@@ -130,17 +130,26 @@ class GoFun:
         headers = {"Authorization": auto}
         params = {"taskType": task}
         while True:
-            qsize = download_queue.qsize()
-            logger.info(f"获取任务，当前队列任务数：{qsize}")
-            if qsize >= 10:
+            try:
+                qsize = download_queue.qsize()
+                logger.info(f"获取任务，当前队列任务数：{qsize}")
+                if qsize >= 10:
+                    time.sleep(2)
+                    continue
+                resp = requests.get(download_url, headers=headers, params=params, timeout=5)
+                json_data = resp.json()
+                result_list = json_data.get("result", [])
+
+                if len(result_list) <= 0:
+                    # 判断任务响应是否为空
+                    time.sleep(2)
+                    continue
+                for task_item in result_list:
+                    download_queue.put(task_item)
+                logger.info(f"成功获取任务个数：{len(result_list)}")
+            except Exception as e:
+                logger.critical(f"获取任务请求异常：{e}")
                 time.sleep(2)
-                continue
-            resp = requests.get(download_url, headers=headers, params=params, timeout=5)
-            json_data = resp.json()
-            result_list = json_data.get("result", [])
-            for task_item in result_list:
-                download_queue.put(task_item)
-            logger.info(f"成功获取任务个数：{len(result_list)}")
 
     def __upload_task(self, upload_queue, ini_info, logger):
         """

{xtn-tools-pro-1.0.0.3.2 → xtn-tools-pro-1.0.0.3.4/xtn_tools_pro.egg-info}/PKG-INFO

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