xtn-tools-pro 1.0.1.0.9__tar.gz → 1.0.1.1.1__tar.gz

{xtn-tools-pro-1.0.1.0.9/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.1.1.1}/PKG-INFO

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

{xtn-tools-pro-1.0.1.0.9 → xtn-tools-pro-1.0.1.1.1}/setup.py

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

{xtn-tools-pro-1.0.1.0.9 → xtn-tools-pro-1.0.1.1.1}/xtn_tools_pro/task_pro/go_fun_v3.py

@@ -187,11 +187,20 @@ class GoFunTaskV3:
         params = {"taskType": task}
         logger.warning("下载队列启动成功...")
         download_queue_exist_cnt = 3
+        now_qsize_v = None
+        now_qsize_v_time = None
         while True:
             try:
                 qsize = download_queue.qsize()
                 logger.info(f"当前队列剩余任务数:{qsize}")
                 if qsize > download_task_qsize:
+                    if not now_qsize_v or qsize != now_qsize_v:
+                        now_qsize_v = qsize
+                        now_qsize_v_time = get_time_now_timestamp(is_time_10=True)
+
+                    if now_qsize_v_time + (60 * 5) < get_time_now_timestamp(is_time_10=True):
+                        manager_info["gofun_kill_status"] = True
+
                     time.sleep(download_not_task_time)
                     continue
                 resp = requests.get(download_url, headers=headers, params=params, timeout=5)

{xtn-tools-pro-1.0.1.0.9 → xtn-tools-pro-1.0.1.1.1}/xtn_tools_pro/utils/shell.py

@@ -36,7 +36,7 @@ class ShellPro:
             self.server_info_list[_]["conn"] = conn
             self.__logger.info(f"{tips} 连接成功!!!")
 
-    def run_shell(self, conn, cmd, warn=False, hide=True,tips=""):
+    def run_shell(self, conn, cmd, warn=False, hide=True, tips=""):
         """
             传入conn和命令执行
         :param conn:
@@ -46,7 +46,8 @@ class ShellPro:
         :param tips: 备注信息
         :return:
         """
-        conn.run(cmd, warn=warn, hide=True)
+        conn.run(cmd, warn=warn, hide=hide)
+        self.__logger.info(f"{tips} {cmd}")
 
     def update_file(self, local_file, remote_file, mkdir=False):
         """
@@ -63,7 +64,7 @@ class ShellPro:
             if mkdir:
                 remote_dir = os.path.dirname(remote_file)
                 cmd = f"mkdir -p {remote_dir}"
-                self.run_shell(conn, cmd=cmd, warn=True,tips=tips)
+                self.run_shell(conn, cmd=cmd, warn=True, tips=tips)
             conn.put(local_file, remote_file)
             self.__logger.info(f"{tips}-{ip} 覆盖远程文件成功!!!")
 

{xtn-tools-pro-1.0.1.0.9 → xtn-tools-pro-1.0.1.1.1/xtn_tools_pro.egg-info}/PKG-INFO

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