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

xtn_tools_pro/task_pro/go_fun_v3.py

@@ -166,7 +166,7 @@ class GoFunTaskV3:
             获取当前网络ip
         :return:
         """
-        while True:
+        for _ in range(10):
             try:
                 rp = requests.get('https://httpbin.org/ip')
                 rp_json = rp.json()
@@ -174,6 +174,7 @@ class GoFunTaskV3:
                 return rp_json['origin']
             except Exception as e:
                 self.logger.critical(f"获取当前网络ip{e}")
+        return "0.0.0.0"
 
     def __download_task(self, download_queue, manager_info, ini_info, logger):
         """
@@ -370,6 +371,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.4.dist-info → xtn_tools_pro-1.0.1.2.6.dist-info}/METADATA

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

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

@@ -51,7 +51,7 @@ 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=qhsLr9vKDDNp6zqqN2GazCwHQpAhxjlNg7Juj0lyhkA,19616
+xtn_tools_pro/task_pro/go_fun_v3.py,sha256=_I92M7ubCknrgNfVe9PDw8KbSaqM3DgOPnurGVbRAf4,20807
 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
@@ -63,9 +63,9 @@ xtn_tools_pro/utils/set_data.py,sha256=BzCLbEDO83csDHBey8kP7SoE6kx6EjqE7OqRBY7k8
 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.4.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.1.2.4.dist-info/METADATA,sha256=90MNJQPrJg_RYhFDGfrqtgZjgpCaLkabPvfw27n1yMc,574
-xtn_tools_pro-1.0.1.2.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.1.2.4.dist-info/entry_points.txt,sha256=t8CtXWOgw7nRDW3XNlZh8MT_P4l8EzsFnyWi5b3ovrc,68
-xtn_tools_pro-1.0.1.2.4.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.1.2.4.dist-info/RECORD,,
+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,,