xtn-tools-pro 1.0.0.7.6__py3-none-any.whl → 1.0.0.7.8__py3-none-any.whl

xtn_tools_pro/task_pro/go_fun_v3.py

@@ -29,14 +29,16 @@ class GoFunTaskV3:
         port = ini_dict.get('port', 0)  # 端口
         task = ini_dict.get('task', '')  # 任务
         auto = ini_dict.get('auto', '')  # token
+        proxies_dict = ini_dict.get('proxies_dict', {})  # 自定义代理
         processes_num = ini_dict.get('processes_num', 0)  # 进程数
         thread_num = ini_dict.get('thread_num', 0)  # 线程数
         restart_time = ini_dict.get('restart_time', 0)  # 间隔x秒强制重启
-        restart_time = 30 * 60 if restart_time <= 0 else restart_time  # 间隔x秒强制重启时间不传默认60分钟
+        restart_time = 60 * 60 if restart_time <= 0 else restart_time  # 间隔x秒强制重启时间不传默认60分钟
         update_proxies_time = ini_dict.get('update_proxies_time', 0)  # 间隔x秒更新代理
         upload_task_time = ini_dict.get('upload_task_time', 0)  # 回写间隔
-        download_not_task_time = ini_dict.get('download_not_task_time', 0)  # 当遇到下载任务接口返回空任务时,间隔x秒再继续请求,默认2秒
-        download_not_task_time = 2 if download_not_task_time <= 0 else download_not_task_time  # 当遇到下载任务接口返回空任务时,间隔x秒再继续请求,默认2秒
+        download_not_task_time = ini_dict.get('download_not_task_time', 0)  # 当遇到下载任务接口返回空任务时,间隔x秒再继续请求
+        download_task_qsize = ini_dict.get('download_task_qsize', 10)  # 触发下载任务队列的最低阈值(当下载队列小于等于x时就立刻请求下载任务接口获取任务),默认10个
+        download_task_qsize = 10 if download_task_qsize < 0 else download_task_qsize  # 触发下载任务队列的最低阈值(当下载队列小于等于x时就立刻请求下载任务接口获取任务),默认10个
 
         # 默认进程数和线程数
         processes_num = 1 if processes_num <= 0 else processes_num
@@ -60,6 +62,7 @@ class GoFunTaskV3:
             "port": int(port),
             "task": task,
             "auto": auto,
+            "proxies_dict": proxies_dict,
             "processes_num": int(processes_num),
             "thread_num": int(thread_num),
             "restart_time": int(restart_time),
@@ -70,6 +73,7 @@ class GoFunTaskV3:
             "update_proxy_url": update_proxy_url,  # 更新代理地址
             "external_ip": external_ip,
             "download_not_task_time": download_not_task_time,
+            "download_task_qsize": download_task_qsize,
         }
 
         logger.debug(
@@ -83,7 +87,7 @@ class GoFunTaskV3:
         self.upload_queue = multiprocessing.Queue()
         manager = multiprocessing.Manager()  # 进程1
         self.manager_info = manager.dict()
-        self.proxies_dict = manager.dict()
+        self.proxies_dict = proxies_dict if proxies_dict else manager.dict()
 
         # 获取任务
         thread_download_task = threading.Thread(target=self.__download_task,
@@ -95,10 +99,11 @@ class GoFunTaskV3:
                                               args=(self.upload_queue, self.__ini_info, logger))
         thread_upload_task.start()
 
-        # 维护代理
-        thread_update_proxy = threading.Thread(target=self.__update_proxy,
-                                               args=(self.proxies_dict, self.manager_info, self.__ini_info, logger))
-        thread_update_proxy.start()
+        if not self.proxies_dict:
+            # 维护代理
+            thread_update_proxy = threading.Thread(target=self.__update_proxy,
+                                                   args=(self.proxies_dict, self.manager_info, self.__ini_info, logger))
+            thread_update_proxy.start()
 
         # go_task_fun_cnt = 0
         # go_task_fun_task_process = None
@@ -149,7 +154,8 @@ class GoFunTaskV3:
                     logger.info("检测到已达强制重启间隔，正在重启...")
                     self.manager_info["gofun_kill_status"] = True
 
-            logger.info(f"主线程正常...{len(go_process_list)}...{self.manager_info['gofun_kill_status']}")
+            logger.info(
+                f"主线程正常...进程数:{len(go_process_list)}...gofun(True不存在|False正常):{self.manager_info['gofun_kill_status']}")
             time.sleep(10)
 
     def __get_external_ip(self):
@@ -176,6 +182,7 @@ class GoFunTaskV3:
         auto = ini_info["auto"]
         task = ini_info["task"]
         download_not_task_time = ini_info["download_not_task_time"]
+        download_task_qsize = ini_info["download_task_qsize"]
         headers = {"Authorization": auto}
         params = {"taskType": task}
 
@@ -184,7 +191,7 @@ class GoFunTaskV3:
             try:
                 qsize = download_queue.qsize()
                 logger.info(f"当前队列剩余任务数:{qsize}")
-                if qsize >= 10:
+                if qsize > download_task_qsize:
                     time.sleep(download_not_task_time)
                     continue
                 resp = requests.get(download_url, headers=headers, params=params, timeout=5)
@@ -360,3 +367,21 @@ class GoFunTaskV3:
         except Exception as e:
             self.logger.critical(f"update_upload_task 更新任务 {self.upload_queue, task_item} 报错 {e}")
             return False
+
+    def help(self):
+        help_txt = """
+        参数说明:
+        host:必填,域名
+        port:选填,端口
+        task:必填,任务类型
+        auto:必填,token
+        proxies_dict:选填,默认为空,为空时会启动获取代理接口获取代理,不为空时则不启动该接口而是一直使用用户传递过来的代理
+        update_proxies_time:选填,默认为0,间隔x秒更新代理,0则每次启动时获取一次之后就不在请求代理接口
+        processes_num:选填,进程数,默认1
+        thread_num:选填,线程数,默认1
+        restart_time:选填,间隔x秒强制重启,默认60分钟
+        upload_task_time:选填,回写间隔,默认0
+        download_not_task_time:选填,默认0,当遇到下载任务接口返回空任务时,间隔x秒再继续请求
+        download_task_qsize:选填,默认10,触发下载任务队列的最低阈值(当下载队列小于等于x时就立刻请求下载任务接口获取任务),默认10个
+        """
+        self.logger.info(help_txt)

{xtn_tools_pro-1.0.0.7.6.dist-info → xtn_tools_pro-1.0.0.7.8.dist-info}/METADATA

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

{xtn_tools_pro-1.0.0.7.6.dist-info → xtn_tools_pro-1.0.0.7.8.dist-info}/RECORD

@@ -12,7 +12,7 @@ xtn_tools_pro/proxy/proxy.py,sha256=No6E1pFY5yx2F4976pXPrLtq-QEVp79KupzcufjSN58,
 xtn_tools_pro/task_pro/__init__.py,sha256=nK3U47hWwE1H875ieEToH9r-jzXHS-PXk8cDstOvRE8,418
 xtn_tools_pro/task_pro/go_fun.py,sha256=hWEt2uJ9FCvJH7PhVZttS-11A7J6zbRKwX7c5YLYQag,19144
 xtn_tools_pro/task_pro/go_fun_v2.py,sha256=SgcXgtEBGSVL1V2LyqO0z8Md2H8JZxucYrLLIwqtiLM,18489
-xtn_tools_pro/task_pro/go_fun_v3.py,sha256=hrep1qgZwHdt06UA03gnCqHN3dJQPIOVDlgfHMQ-b3U,16202
+xtn_tools_pro/task_pro/go_fun_v3.py,sha256=Pd_FFKxd7GdiNxc-3x7U0q7OBBHD7N5QH692XchwWts,17883
 xtn_tools_pro/utils/__init__.py,sha256=I1_n_NP23F2lBqlF4EOlnOdLYxM8M4pbn63UhJN1hRE,418
 xtn_tools_pro/utils/crypto.py,sha256=oyzFqWum_oimUtzhfVCELQhdMjxDbLu-nOWfcNmazcc,4087
 xtn_tools_pro/utils/file_utils.py,sha256=obaBP7CaBCsXxzqGeWzV2l0yw7vicgKOaXzmpMV8ips,2567
@@ -22,8 +22,8 @@ xtn_tools_pro/utils/retry.py,sha256=0wjHsR5DBBKpv4naMfxiky8kprrZes4WURIfFQ4H708,
 xtn_tools_pro/utils/set_data.py,sha256=IthfAclck7AbaxOIKOgJZ2wdcfEmlvC-C63Tywcr4bA,11180
 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.0.7.6.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.0.7.6.dist-info/METADATA,sha256=tmwkoN88fvaSp5NKuzBXMSllaKXplaUQx0RhIlfjoho,498
-xtn_tools_pro-1.0.0.7.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.0.7.6.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.0.7.6.dist-info/RECORD,,
+xtn_tools_pro-1.0.0.7.8.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.0.7.8.dist-info/METADATA,sha256=iL7cELlsKjZXE79i-3a39WXwE7drXBsjOvmv4_KpoPM,498
+xtn_tools_pro-1.0.0.7.8.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.0.7.8.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.0.7.8.dist-info/RECORD,,