ryry-cli 4.25__tar.gz → 4.27__tar.gz

{ryry_cli-4.25/ryry_cli.egg-info → ryry_cli-4.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 4.25
+Version: 4.27
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen
@@ -23,6 +23,7 @@ Requires-Dist: gputil
 Requires-Dist: urlparser
 Requires-Dist: urllib3
 Requires-Dist: portalocker
+Requires-Dist: PyYAML
 Provides-Extra: with-mecord
 Requires-Dist: mecord-cli>=0.7.405; extra == "with-mecord"
 

{ryry_cli-4.25 → ryry_cli-4.27}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="4.25"
-app_bulld_anchor="Noh_2025-07-29 15:39:39.681916"
+app_version="4.27"
+app_bulld_anchor="Noh_2025-07-29 16:03:03.738626"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-4.25 → ryry_cli-4.27}/ryry/daemon_manager.py

@@ -255,7 +255,6 @@ class DaemonManager:
                             daemon_info["accept_tasks"] = ready_info.get("accept_tasks", False)
                             config[widget_id] = daemon_info
                             self._write_daemon_config(config)
-                            taskUtils.taskPrint(None, f"Daemon {widget_id} 就绪信号已收到")
                             break
                         except Exception as e:
                             taskUtils.taskPrint(None, f"读取就绪信号文件失败: {e}")
@@ -368,14 +367,11 @@ class DaemonManager:
         daemon_info = config.get(widget_id, {})
         
         if not daemon_info:
-            taskUtils.taskPrint(None, f"Daemon {widget_id} 无配置信息")
             return {"running": False, "ready": False, "accept_tasks": False}
         
         pid = daemon_info.get("pid", 0)
         running = daemon_info.get("running", False) and self._is_process_alive(pid)
         
-        taskUtils.taskPrint(None, f"Daemon {widget_id} 状态检查: PID={pid}, config_running={daemon_info.get('running', False)}, process_alive={self._is_process_alive(pid)}, final_running={running}")
-        
         # 如果进程还活着，检查是否有停止信号文件
         if running:
             stop_file = os.path.join(constant.base_path, f"daemon_stopped_{widget_id}.json")
@@ -427,8 +423,6 @@ class DaemonManager:
         """同步daemon状态与widgetMap，自动关闭不需要的daemon，启动需要的新daemon"""
         config = self._read_daemon_config()
         widget_map = store.widgetMap()
-        
-        taskUtils.taskPrint(None, f"开始同步daemon状态，当前配置: {list(config.keys())}")
 
         # 0. 首先检查所有已死亡的daemon进程并清理
         dead_daemons = []
@@ -437,8 +431,6 @@ class DaemonManager:
                 pid = daemon_info.get("pid", 0)
                 # 检查进程是否还活着
                 is_alive = self._is_process_alive(pid)
-                taskUtils.taskPrint(None, f"检查daemon {widget_id} (PID: {pid}): {'活着' if is_alive else '死亡'}")
-                
                 if not is_alive:
                     dead_daemons.append(widget_id)
                     taskUtils.taskPrint(None, f"Found dead daemon {widget_id} with PID {pid}")
@@ -503,8 +495,6 @@ class DaemonManager:
                 status = self.get_daemon_status(widget_id)
                 daemon_info = config.get(widget_id)
                 
-                taskUtils.taskPrint(None, f"检查widget {widget_id}: status={status.get('running', False)}, daemon_info={daemon_info.get('running', False) if daemon_info else 'None'}")
-                
                 # 检查是否需要启动
                 need_start = False
                 reason = ""
@@ -519,8 +509,6 @@ class DaemonManager:
                 if need_start:
                     taskUtils.taskPrint(None, f"Starting daemon {widget_id}: {reason}")
                     self.start_daemon(widget_id, widget_info)
-                else:
-                    taskUtils.taskPrint(None, f"Daemon {widget_id} 无需启动")
 
     # 建议在start_all_daemons后调用一次同步
     def start_all_daemons(self):

{ryry_cli-4.25 → ryry_cli-4.27}/ryry/proxy_manager.py

@@ -18,7 +18,7 @@ class ProxyManager:
     """代理管理器，用于管理clashcore代理"""
     
     def __init__(self, config_path: Optional[str] = None):
-        pass
+        return
         self.config_path = config_path or self._get_default_config_path()
         self.clash_process = None
         self.proxy_enabled = False

{ryry_cli-4.25 → ryry_cli-4.27}/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.25":
+            elif read_data["extend"].get("app", "") == "ryry-cli 4.27":
                 _genExtend()
         else:
             _genExtend()

{ryry_cli-4.25 → ryry_cli-4.27/ryry_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 4.25
+Version: 4.27
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen
@@ -23,6 +23,7 @@ Requires-Dist: gputil
 Requires-Dist: urlparser
 Requires-Dist: urllib3
 Requires-Dist: portalocker
+Requires-Dist: PyYAML
 Provides-Extra: with-mecord
 Requires-Dist: mecord-cli>=0.7.405; extra == "with-mecord"
 

{ryry_cli-4.25 → ryry_cli-4.27}/ryry_cli.egg-info/SOURCES.txt

@@ -16,7 +16,6 @@ ryry/shared_memory.py
 ryry/store.py
 ryry/task.py
 ryry/taskUtils.py
-ryry/test_proxy.py
 ryry/upload.py
 ryry/utils.py
 ryry/script_template/__init__.py

{ryry_cli-4.25 → ryry_cli-4.27}/ryry_cli.egg-info/requires.txt

@@ -10,6 +10,7 @@ gputil
 urlparser
 urllib3
 portalocker
+PyYAML
 
 [with_mecord]
 mecord-cli>=0.7.405

{ryry_cli-4.25 → ryry_cli-4.27}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "4.25"
+ryry_version = "4.27"
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")
 try:
@@ -69,7 +69,8 @@ setuptools.setup(
         'gputil',
         'urlparser',
         'urllib3',
-        'portalocker'
+        'portalocker',
+        'PyYAML'
     ],
     extras_require={
         'with_mecord': ['mecord-cli>=0.7.405'],

ryry_cli-4.25/ryry/test_proxy.py

@@ -1 +0,0 @@
-