ryry-cli 4.15__tar.gz → 4.16__tar.gz

{ryry_cli-4.15/ryry_cli.egg-info → ryry_cli-4.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 4.15
+Version: 4.16
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen

{ryry_cli-4.15 → ryry_cli-4.16}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="4.15"
-app_bulld_anchor="Noh_2025-07-22 14:52:18.517215"
+app_version="4.16"
+app_bulld_anchor="Noh_2025-07-22 16:42:23.102783"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-4.15 → ryry_cli-4.16}/ryry/daemon_manager.py

@@ -238,8 +238,8 @@ class DaemonManager:
                 return True
             
             try:
-                # 发送停止命令
-                response = self._send_command_to_process(widget_id, {"type": "stop"}, 600)
+                # 发送停止命令（最长等待1小时是否正常结束）
+                response = self._send_command_to_process(widget_id, {"type": "stop"}, 3600)
                 if response and response.get("type") == "stop_result":
                     # 等待进程结束
                     start_time = time.time()

{ryry_cli-4.15 → ryry_cli-4.16}/ryry/main.py

@@ -102,10 +102,10 @@ def widget_status(stdscr, idx):
         name = widget_map[it]["name"]
         version = widget_map[it].get("version", "1.0")
         max_task_number = widget_map[it].get("max_task_number", 1)
-        timeout = widget_map[it].get("timeout", 600)
+        timeout = widget_map[it].get("timeout", 0)
         end_args = ""
         if is_block:
-            end_args = "[X]"
+            end_args += "[X]"
         
         # 检查daemon状态
         color_pair = 0
@@ -120,11 +120,14 @@ def widget_status(stdscr, idx):
         elif daemon_manager and daemon_manager.should_start_daemon(it):
             color_pair = 2
             end_args += "[后台未运行]"  # 应该启动但未运行
-        
+        #检查timeout，如果没有填写不显示
+        if timeout > 0:
+            end_args += f" OOT:{timeout}s"
+            
         max_task_number_str = ""
         if max_task_number > 0:
             max_task_number_str = f"*{max_task_number}"
-        real_stdsrc(idx, 0, scr_str(f'{f"[{name}{max_task_number_str} v{version}] {it}{end_args} OOT:{timeout}s".ljust(maxJust)}'.ljust(ll*3-2)), curses.color_pair(color_pair))
+        real_stdsrc(idx, 0, scr_str(f'{f"[{name}{max_task_number_str} v{version}] {it}{end_args}".ljust(maxJust)}'.ljust(ll*3-2)), curses.color_pair(color_pair))
         idx+=1
         real_stdsrc(idx, 0, scr_str(f'  PATH:{path}'.ljust(ll*3-2)))
         idx+=1

{ryry_cli-4.15 → ryry_cli-4.16}/ryry/store.py

@@ -155,7 +155,7 @@ def extend():
                 _genExtend()
             elif read_data["extend"].get("device_id", "") != read_data.get("deviceInfo", {}).get("device_id", ""):
                 _genExtend()
-            elif read_data["extend"].get("app", "") == "ryry-cli 4.15":
+            elif read_data["extend"].get("app", "") == "ryry-cli 4.16":
                 _genExtend()
         else:
             _genExtend()

{ryry_cli-4.15 → ryry_cli-4.16/ryry_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 4.15
+Version: 4.16
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen

{ryry_cli-4.15 → ryry_cli-4.16}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "4.15"
+ryry_version = "4.16"
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")
 try: