ryry-cli 4.22__tar.gz → 4.24__tar.gz

{ryry_cli-4.22/ryry_cli.egg-info → ryry_cli-4.24}/PKG-INFO

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

{ryry_cli-4.22 → ryry_cli-4.24}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="4.22"
-app_bulld_anchor="Noh_2025-07-24 11:12:04.496003"
+app_version="4.24"
+app_bulld_anchor="Noh_2025-07-24 14:12:11.378741"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-4.22 → ryry_cli-4.24}/ryry/daemon_manager.py

@@ -49,8 +49,31 @@ class DaemonManager:
         try:
             if pid <= 0:
                 return False
-            os.kill(pid, 0)
-            return True
+            
+            import platform
+            if platform.system() == "Windows":
+                # Windows系统使用tasklist命令检查进程
+                import subprocess
+                try:
+                    result = subprocess.run(['tasklist', '/FI', f'PID eq {pid}'], 
+                                          capture_output=True, text=True, timeout=5)
+                    return str(pid) in result.stdout
+                except:
+                    # 如果tasklist失败，尝试使用psutil
+                    try:
+                        import psutil
+                        return psutil.pid_exists(pid)
+                    except ImportError:
+                        # 如果psutil不可用，使用os.kill但捕获异常
+                        try:
+                            os.kill(pid, 0)
+                            return True
+                        except (OSError, ProcessLookupError):
+                            return False
+            else:
+                # Unix-like系统使用os.kill(pid, 0)
+                os.kill(pid, 0)
+                return True
         except (OSError, ProcessLookupError):
             return False
     

{ryry_cli-4.22 → ryry_cli-4.24}/ryry/main.py

@@ -1,4 +1,4 @@
-import sys, os, urllib3, time, platform, json, curses
+import sys, os, urllib3, time, platform, json
 
 from ryry import utils
 from ryry import ryry_service
@@ -127,7 +127,10 @@ def widget_status(stdscr, idx):
         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}".ljust(maxJust)}'.ljust(ll*3-2)), curses.color_pair(color_pair))
+        if platform.system() == 'Windows':
+            real_stdsrc(idx, 0, scr_str(f'{f"[{name}{max_task_number_str} v{version}] {it}{end_args}".ljust(maxJust)}'.ljust(ll*3-2)))
+        else:
+            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
@@ -186,6 +189,7 @@ def status():
         widget_status(None, 0)
         print(scr_line("-" * ll*3))
     else:
+        import curses
         stdscr = curses.initscr()
         curses.noecho()
         curses.cbreak()

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

{ryry_cli-4.22 → ryry_cli-4.24/ryry_cli.egg-info}/PKG-INFO

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

{ryry_cli-4.22 → ryry_cli-4.24}/setup.py

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