ryry-cli 4.22__tar.gz → 4.23__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {ryry_cli-4.22/ryry_cli.egg-info → ryry_cli-4.23}/PKG-INFO +1 -1
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry/constant.py +2 -2
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry/daemon_manager.py +25 -2
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry/store.py +1 -1
- {ryry_cli-4.22 → ryry_cli-4.23/ryry_cli.egg-info}/PKG-INFO +1 -1
- {ryry_cli-4.22 → ryry_cli-4.23}/setup.py +1 -1
- {ryry_cli-4.22 → ryry_cli-4.23}/LICENSE +0 -0
- {ryry_cli-4.22 → ryry_cli-4.23}/README.md +0 -0
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry/__init__.py +0 -0
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry/daemon_base.py +0 -0
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry/main.py +0 -0
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry/ryry_server_socket.py +0 -0
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry/ryry_service.py +0 -0
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry/ryry_webapi.py +0 -0
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry/ryry_widget.py +0 -0
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry/script_template/__init__.py +0 -0
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry/script_template/daemon.py +0 -0
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry/script_template/main.py +0 -0
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry/script_template/run.py +0 -0
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry/server_func.py +0 -0
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry/shared_memory.py +0 -0
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry/task.py +0 -0
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry/taskUtils.py +0 -0
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry/upload.py +0 -0
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry/utils.py +0 -0
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry_cli.egg-info/SOURCES.txt +0 -0
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry_cli.egg-info/dependency_links.txt +0 -0
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry_cli.egg-info/entry_points.txt +0 -0
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry_cli.egg-info/requires.txt +0 -0
- {ryry_cli-4.22 → ryry_cli-4.23}/ryry_cli.egg-info/top_level.txt +0 -0
- {ryry_cli-4.22 → ryry_cli-4.23}/setup.cfg +0 -0
|
@@ -49,8 +49,31 @@ class DaemonManager:
|
|
|
49
49
|
try:
|
|
50
50
|
if pid <= 0:
|
|
51
51
|
return False
|
|
52
|
-
|
|
53
|
-
|
|
52
|
+
|
|
53
|
+
import platform
|
|
54
|
+
if platform.system() == "Windows":
|
|
55
|
+
# Windows系统使用tasklist命令检查进程
|
|
56
|
+
import subprocess
|
|
57
|
+
try:
|
|
58
|
+
result = subprocess.run(['tasklist', '/FI', f'PID eq {pid}'],
|
|
59
|
+
capture_output=True, text=True, timeout=5)
|
|
60
|
+
return str(pid) in result.stdout
|
|
61
|
+
except:
|
|
62
|
+
# 如果tasklist失败,尝试使用psutil
|
|
63
|
+
try:
|
|
64
|
+
import psutil
|
|
65
|
+
return psutil.pid_exists(pid)
|
|
66
|
+
except ImportError:
|
|
67
|
+
# 如果psutil不可用,使用os.kill但捕获异常
|
|
68
|
+
try:
|
|
69
|
+
os.kill(pid, 0)
|
|
70
|
+
return True
|
|
71
|
+
except (OSError, ProcessLookupError):
|
|
72
|
+
return False
|
|
73
|
+
else:
|
|
74
|
+
# Unix-like系统使用os.kill(pid, 0)
|
|
75
|
+
os.kill(pid, 0)
|
|
76
|
+
return True
|
|
54
77
|
except (OSError, ProcessLookupError):
|
|
55
78
|
return False
|
|
56
79
|
|
|
@@ -155,7 +155,7 @@ def extend():
|
|
|
155
155
|
_genExtend()
|
|
156
156
|
elif read_data["extend"].get("device_id", "") != read_data.get("deviceInfo", {}).get("device_id", ""):
|
|
157
157
|
_genExtend()
|
|
158
|
-
elif read_data["extend"].get("app", "") == "ryry-cli 4.
|
|
158
|
+
elif read_data["extend"].get("app", "") == "ryry-cli 4.23":
|
|
159
159
|
_genExtend()
|
|
160
160
|
else:
|
|
161
161
|
_genExtend()
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|