ryry-cli 4.21__tar.gz → 4.22__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.21/ryry_cli.egg-info → ryry_cli-4.22}/PKG-INFO +3 -2
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry/constant.py +2 -2
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry/daemon_base.py +3 -1
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry/store.py +1 -1
- {ryry_cli-4.21 → ryry_cli-4.22/ryry_cli.egg-info}/PKG-INFO +3 -2
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry_cli.egg-info/requires.txt +2 -0
- {ryry_cli-4.21 → ryry_cli-4.22}/setup.py +5 -3
- {ryry_cli-4.21 → ryry_cli-4.22}/LICENSE +0 -0
- {ryry_cli-4.21 → ryry_cli-4.22}/README.md +0 -0
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry/__init__.py +0 -0
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry/daemon_manager.py +0 -0
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry/main.py +0 -0
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry/ryry_server_socket.py +0 -0
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry/ryry_service.py +0 -0
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry/ryry_webapi.py +0 -0
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry/ryry_widget.py +0 -0
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry/script_template/__init__.py +0 -0
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry/script_template/daemon.py +0 -0
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry/script_template/main.py +0 -0
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry/script_template/run.py +0 -0
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry/server_func.py +0 -0
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry/shared_memory.py +0 -0
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry/task.py +0 -0
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry/taskUtils.py +0 -0
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry/upload.py +0 -0
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry/utils.py +0 -0
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry_cli.egg-info/SOURCES.txt +0 -0
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry_cli.egg-info/dependency_links.txt +0 -0
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry_cli.egg-info/entry_points.txt +0 -0
- {ryry_cli-4.21 → ryry_cli-4.22}/ryry_cli.egg-info/top_level.txt +0 -0
- {ryry_cli-4.21 → ryry_cli-4.22}/setup.cfg +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: ryry-cli
|
|
3
|
-
Version: 4.
|
|
3
|
+
Version: 4.22
|
|
4
4
|
Summary: ryry tools
|
|
5
5
|
Home-page: https://github.com/dalipenMedia
|
|
6
6
|
Author: dalipen
|
|
@@ -23,7 +23,8 @@ Requires-Dist: gputil
|
|
|
23
23
|
Requires-Dist: urlparser
|
|
24
24
|
Requires-Dist: urllib3
|
|
25
25
|
Requires-Dist: portalocker
|
|
26
|
-
|
|
26
|
+
Provides-Extra: with-mecord
|
|
27
|
+
Requires-Dist: mecord-cli>=0.7.405; extra == "with-mecord"
|
|
27
28
|
|
|
28
29
|
ryry Python Tool
|
|
29
30
|
===============================================
|
|
@@ -6,6 +6,7 @@ import signal
|
|
|
6
6
|
import threading
|
|
7
7
|
from typing import Optional, Dict, Any
|
|
8
8
|
from ryry import ryry_webapi
|
|
9
|
+
import platform
|
|
9
10
|
|
|
10
11
|
class SimpleDaemonBase:
|
|
11
12
|
"""
|
|
@@ -56,7 +57,8 @@ class SimpleDaemonBase:
|
|
|
56
57
|
self.running = False
|
|
57
58
|
|
|
58
59
|
# 注册信号处理器
|
|
59
|
-
|
|
60
|
+
if platform.system() != "Windows":
|
|
61
|
+
signal.signal(signal.SIGINT, signal_handler) # Ctrl+C (在Windows上禁用)
|
|
60
62
|
signal.signal(signal.SIGTERM, signal_handler) # 终止信号
|
|
61
63
|
|
|
62
64
|
if hasattr(signal, 'SIGBREAK'):
|
|
@@ -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.22":
|
|
159
159
|
_genExtend()
|
|
160
160
|
else:
|
|
161
161
|
_genExtend()
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: ryry-cli
|
|
3
|
-
Version: 4.
|
|
3
|
+
Version: 4.22
|
|
4
4
|
Summary: ryry tools
|
|
5
5
|
Home-page: https://github.com/dalipenMedia
|
|
6
6
|
Author: dalipen
|
|
@@ -23,7 +23,8 @@ Requires-Dist: gputil
|
|
|
23
23
|
Requires-Dist: urlparser
|
|
24
24
|
Requires-Dist: urllib3
|
|
25
25
|
Requires-Dist: portalocker
|
|
26
|
-
|
|
26
|
+
Provides-Extra: with-mecord
|
|
27
|
+
Requires-Dist: mecord-cli>=0.7.405; extra == "with-mecord"
|
|
27
28
|
|
|
28
29
|
ryry Python Tool
|
|
29
30
|
===============================================
|
|
@@ -3,7 +3,7 @@ import os
|
|
|
3
3
|
import subprocess
|
|
4
4
|
import datetime
|
|
5
5
|
|
|
6
|
-
ryry_version = "4.
|
|
6
|
+
ryry_version = "4.22"
|
|
7
7
|
cur_dir = os.path.dirname(os.path.abspath(__file__))
|
|
8
8
|
constanspy = os.path.join(cur_dir, "ryry", "constant.py")
|
|
9
9
|
try:
|
|
@@ -69,9 +69,11 @@ setuptools.setup(
|
|
|
69
69
|
'gputil',
|
|
70
70
|
'urlparser',
|
|
71
71
|
'urllib3',
|
|
72
|
-
'portalocker'
|
|
73
|
-
'mecord-cli>=0.7.405',
|
|
72
|
+
'portalocker'
|
|
74
73
|
],
|
|
74
|
+
extras_require={
|
|
75
|
+
'with_mecord': ['mecord-cli>=0.7.405'],
|
|
76
|
+
},
|
|
75
77
|
dependency_links=[],
|
|
76
78
|
entry_points={
|
|
77
79
|
'console_scripts':[
|
|
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
|