ryry-cli 4.12__tar.gz → 4.14__tar.gz

{ryry_cli-4.12/ryry_cli.egg-info → ryry_cli-4.14}/PKG-INFO

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

{ryry_cli-4.12 → ryry_cli-4.14}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="4.12"
-app_bulld_anchor="Noh_2025-07-21 15:09:23.991341"
+app_version="4.14"
+app_bulld_anchor="Noh_2025-07-22 14:21:58.369577"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-4.12 → ryry_cli-4.14}/ryry/daemon_base.py

@@ -3,6 +3,7 @@ import os
 import json
 import time
 import signal
+import threading
 from typing import Optional, Dict, Any
 
 class SimpleDaemonBase:
@@ -83,6 +84,13 @@ class SimpleDaemonBase:
         """
         pass
 
+    def wait_for_tasks_completion(self, timeout: int = 30) -> bool:
+        """
+        等待任务完成的方法 - 子类可选实现
+        返回True表示所有任务已完成，False表示超时
+        """
+        return True
+
     # ==================== 通信方法 ====================
     
     def send_ready_signal(self):
@@ -94,6 +102,19 @@ class SimpleDaemonBase:
         except Exception as e:
             print(f"发送就绪信号失败: {e}", file=sys.stderr)
 
+    def send_stop_signal(self):
+        """发送停止信号"""
+        try:
+            stop_file = os.path.join(self.base_path, f"daemon_stopped_{self.widget_id}.json")
+            with open(stop_file, 'w', encoding='utf-8') as f:
+                json.dump({
+                    "widget_id": self.widget_id,
+                    "stopped_at": time.time(),
+                    "pid": os.getpid()
+                }, f)
+        except Exception as e:
+            print(f"发送停止信号失败: {e}", file=sys.stderr)
+
     def process_command(self):
         """处理命令文件"""
         cmd_file = os.path.join(self.base_path, f"daemon_cmd_{self.widget_id}.json")
@@ -182,7 +203,7 @@ class SimpleDaemonBase:
         """
         return {
             "healthy": True,
-            "state": "running",
+            "state": "running" if self.running else "stopped",
             "accept_tasks": False,
             "timestamp": time.time()
         }
@@ -206,8 +227,10 @@ class SimpleDaemonBase:
                 try:
                     # 处理命令
                     self.process_command()
+                    
                     # 执行循环函数
                     self.loop_function()
+                    
                     time.sleep(1)
                 except KeyboardInterrupt:
                     print(f"【{self.widget_name}】收到KeyboardInterrupt", file=sys.stderr)
@@ -215,10 +238,19 @@ class SimpleDaemonBase:
                 except Exception as e:
                     print(f"主循环异常: {e}", file=sys.stderr)
                     time.sleep(5)  # 异常后等待5秒再继续
+            
+            # 等待任务完成
+            print(f"【{self.widget_name}】等待任务完成...", file=sys.stderr)
+            tasks_completed = self.wait_for_tasks_completion(timeout=60)
+            if not tasks_completed:
+                print(f"【{self.widget_name}】任务等待超时，强制停止", file=sys.stderr)
+            
             # 清理
             self.on_stop()
             
         except Exception as e:
             print(f"运行异常: {e}", file=sys.stderr)
         finally:
+            # 发送停止信号
+            self.send_stop_signal()
             print(f"【{self.widget_name}】进程终止", file=sys.stderr) 

{ryry_cli-4.12 → ryry_cli-4.14}/ryry/daemon_manager.py

@@ -316,7 +316,22 @@ class DaemonManager:
         if not daemon_info:
             return {"running": False, "ready": False, "accept_tasks": False}
         
-        running = daemon_info.get("running", False) and self._is_process_alive(daemon_info.get("pid", 0))
+        pid = daemon_info.get("pid", 0)
+        running = daemon_info.get("running", False) and self._is_process_alive(pid)
+        
+        # 如果进程还活着，检查是否有停止信号文件
+        if running:
+            stop_file = os.path.join(constant.base_path, f"daemon_stopped_{widget_id}.json")
+            if os.path.exists(stop_file):
+                try:
+                    with open(stop_file, 'r', encoding='utf-8') as f:
+                        stop_info = json.load(f)
+                    os.remove(stop_file)
+                    # 验证PID是否匹配
+                    if stop_info.get("pid") == pid:
+                        running = False
+                except:
+                    pass
         
         if not running and daemon_info.get("running", False):
             # 清理无效进程
@@ -336,6 +351,9 @@ class DaemonManager:
     
     def stop_all_daemons(self) -> bool:
         """停止所有常驻进程"""
+        # 首先清理已死亡的进程
+        self.sync_daemons_with_widget_map()
+        
         config = self._read_daemon_config()
         widget_ids = list(config.keys())
         
@@ -350,6 +368,38 @@ class DaemonManager:
         """同步daemon状态与widgetMap，自动关闭不需要的daemon，启动需要的新daemon"""
         config = self._read_daemon_config()
         widget_map = store.widgetMap()
+
+        # 0. 首先检查所有已死亡的daemon进程并清理
+        dead_daemons = []
+        for widget_id, daemon_info in config.items():
+            if daemon_info.get("running", False):
+                pid = daemon_info.get("pid", 0)
+                # 检查进程是否还活着
+                if not self._is_process_alive(pid):
+                    dead_daemons.append(widget_id)
+                else:
+                    # 检查是否有停止信号文件
+                    stop_file = os.path.join(constant.base_path, f"daemon_stopped_{widget_id}.json")
+                    if os.path.exists(stop_file):
+                        try:
+                            with open(stop_file, 'r', encoding='utf-8') as f:
+                                stop_info = json.load(f)
+                            os.remove(stop_file)
+                            # 验证PID是否匹配
+                            if stop_info.get("pid") == pid:
+                                dead_daemons.append(widget_id)
+                        except:
+                            pass
+
+        if dead_daemons:
+            with self.lock:
+                config = self._read_daemon_config()
+                for widget_id in dead_daemons:
+                    if widget_id in config:
+                        del config[widget_id]
+                        taskUtils.taskPrint(None, f"清理已停止的daemon进程: {widget_id}")
+                self._write_daemon_config(config)
+
         # 1. 关闭不需要的daemon（被移除、被屏蔽、版本不一致）
         for widget_id in list(config.keys()):
             daemon_info = config[widget_id]
@@ -370,6 +420,7 @@ class DaemonManager:
                     need_stop = True
             if need_stop:
                 self.stop_daemon(widget_id)
+                
         # 2. 启动需要的daemon（未运行、或因上述原因被重启）
         for widget_id, widget_info in widget_map.items():
             is_block = widget_info.get("isBlock", False)

{ryry_cli-4.12 → ryry_cli-4.14}/ryry/main.py

@@ -1,4 +1,4 @@
-import sys, os, urllib3, time, platform, json
+import sys, os, urllib3, time, platform, json, curses
 
 from ryry import utils
 from ryry import ryry_service
@@ -108,19 +108,23 @@ def widget_status(stdscr, idx):
             end_args = "[X]"
         
         # 检查daemon状态
+        color_pair = 0
         daemon_status = daemon_statuses.get(it, {})
         if daemon_status.get("running", False):
             if daemon_status.get("accept_tasks", False):
-                end_args += "[D]"  # 运行中且接受任务
+                color_pair = 1
+                end_args += "[后台运行中+接受任务]"  # 运行中且接受任务
             else:
-                end_args += "[D-]" # 运行中但不接受任务
+                color_pair = 1
+                end_args += "[后台运行中]" # 运行中但不接受任务
         elif daemon_manager and daemon_manager.should_start_daemon(it):
-            end_args += "[d]"  # 应该启动但未运行
+            color_pair = 2
+            end_args += "[后台未运行]"  # 应该启动但未运行
         
         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)))
+        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))
         idx+=1
         real_stdsrc(idx, 0, scr_str(f'  PATH:{path}'.ljust(ll*3-2)))
         idx+=1
@@ -179,7 +183,6 @@ def status():
         widget_status(None, 0)
         print(scr_line("-" * ll*3))
     else:
-        import curses
         stdscr = curses.initscr()
         curses.noecho()
         curses.cbreak()
@@ -323,7 +326,7 @@ def widget():
             if is_block:
                 end_args = " [X]"
             if daemon_enabled:
-                end_args += " [D]"
+                end_args += " [支持后台运行]"
             ss = f"{it}{end_args}"
             if showStatus in ["disable", "enable"]:
                 if is_block and showStatus == "disable":

{ryry_cli-4.12 → ryry_cli-4.14}/ryry/ryry_service.py

@@ -67,6 +67,7 @@ class ryryService:
         with open(pid_file, 'w', encoding='utf-8') as f:
             f.write(str(os.getpid()))
         signal.signal(signal.SIGTERM, self.stop)
+        # signal.signal(signal.SIGINT, self.stop)
         store.save_multithread(threadNum)
         store.writeDeviceInfo(utils.deviceInfo())
         TaskConnector._clearTask()
@@ -80,6 +81,7 @@ class ryryService:
         
         #3: service step
         while (os.path.exists(stop_file) == False):
+            print("~~~~~~~~")
             time.sleep(5)
         print("Prepare stop")
         
@@ -133,6 +135,7 @@ class ryryDaemonThread(Thread):
         self.start()    
     
     def run(self):
+        #延迟启动
         print(f"   {self.name} start")
         daemon_manager.start_all_daemons()
         
@@ -142,7 +145,6 @@ class ryryDaemonThread(Thread):
                 daemon_manager.sync_daemons_with_widget_map()
             except:
                 time.sleep(60)
-                
         try:
             print("Stopping daemon processes...")
             if daemon_manager.stop_all_daemons():

{ryry_cli-4.12 → ryry_cli-4.14}/ryry/store.py

@@ -155,11 +155,14 @@ 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.14":
+                _genExtend()
         else:
             _genExtend()
     return GLOBAL_EXT_JSON
 
 def _genExtend():
+    print("asdasdas _genExtend ")
     sp = Store()
     read_data = sp.read()
     if "deviceInfo" in read_data:

{ryry_cli-4.12 → ryry_cli-4.14}/ryry/upload.py

@@ -191,7 +191,7 @@ def deepFtpUpload(file, new_file_name, ftp, writepath, readpath):
             
     with open(file, 'rb') as f:
         ftp.storbinary(f'STOR {new_file_name}', f)
-    return f"{readpath}/{new_file_name}"
+    return f"{readpath}/{writepath}/{new_file_name}"
 
 def ftpUpload(file, new_file_name, subdomain, upload_path=""):
     ip = subdomain["host"]
@@ -214,7 +214,7 @@ def ftpUpload(file, new_file_name, subdomain, upload_path=""):
                     if upload_path:
                         if upload_path[0:1] == "/":
                             upload_path = upload_path[1:]
-                        s = deepFtpUpload(file, new_file_name, ftp, upload_path, f'ftp://{ip}/{upload_path}')
+                        s = deepFtpUpload(file, new_file_name, ftp, upload_path, f'ftp://{ip}/mnt/NAS/mcn')
                     else:
                         s = deepFtpUpload(file, new_file_name, ftp, writepath, readpath)
                     
@@ -228,7 +228,7 @@ def ftpUpload(file, new_file_name, subdomain, upload_path=""):
             if upload_path:
                 if upload_path[0:1] == "/":
                     upload_path = upload_path[1:]
-                s = deepFtpUpload(file, new_file_name, ftp, upload_path, f'ftp://{ip}/{upload_path}')
+                s = deepFtpUpload(file, new_file_name, ftp, upload_path, f'ftp://{ip}/mnt/NAS/mcn')
             else:
                 s = deepFtpUpload(file, new_file_name, ftp, writepath, readpath)
             
@@ -263,16 +263,16 @@ ftp_192_168_50_12={
     "port": 21,
     "username" : "mcn",
     "password" : "meco@2024+",
-    "writepath" : "mnt/NAS/mcn/cache",
-    "readpath" : "ftp://192.168.50.12/mnt/NAS/mcn/cache"
+    "writepath" : "cache",
+    "readpath" : "ftp://192.168.50.12/mnt/NAS/mcn"
 }
 ftp_183_6_90_205={
     "host" : "183.6.90.205",
     "port": 2221,
     "username" : "mcn",
     "password" : "meco@2024+",
-    "writepath" : "mnt/NAS/mcn/cache",
-    "readpath" : "ftp://183.6.90.205/mnt/NAS/mcn/cache"
+    "writepath" : "cache",
+    "readpath" : "ftp://183.6.90.205/mnt/NAS/mcn"
 }
 
 from ryry import utils

{ryry_cli-4.12 → ryry_cli-4.14/ryry_cli.egg-info}/PKG-INFO

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

{ryry_cli-4.12 → ryry_cli-4.14}/setup.py

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