ryry-cli 6.8__tar.gz → 6.10__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-6.8/ryry_cli.egg-info → ryry_cli-6.10}/PKG-INFO +1 -1
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry/constant.py +2 -2
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry/ryry_widget.py +2 -2
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry/store.py +23 -10
- {ryry_cli-6.8 → ryry_cli-6.10/ryry_cli.egg-info}/PKG-INFO +1 -1
- {ryry_cli-6.8 → ryry_cli-6.10}/setup.py +1 -1
- {ryry_cli-6.8 → ryry_cli-6.10}/LICENSE +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/README.md +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry/__init__.py +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry/daemon_base.py +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry/daemon_manager.py +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry/main.py +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry/proxy_manager.py +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry/ryry_server_socket.py +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry/ryry_service.py +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry/ryry_webapi.py +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry/script_template/__init__.py +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry/script_template/daemon.py +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry/script_template/main.py +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry/script_template/run.py +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry/server_func.py +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry/shared_memory.py +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry/task.py +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry/taskUtils.py +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry/upload.py +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry/utils.py +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry_cli.egg-info/SOURCES.txt +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry_cli.egg-info/dependency_links.txt +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry_cli.egg-info/entry_points.txt +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry_cli.egg-info/requires.txt +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/ryry_cli.egg-info/top_level.txt +0 -0
- {ryry_cli-6.8 → ryry_cli-6.10}/setup.cfg +0 -0
|
@@ -440,7 +440,7 @@ def UpdateWidgetFromPypi():
|
|
|
440
440
|
#update
|
|
441
441
|
widgetReInstall(py_package, package_url, local_path)
|
|
442
442
|
widgetUpdateNotify(py_package, local_version, remote_version)
|
|
443
|
-
store.updateWidgetVersion(it,
|
|
443
|
+
store.updateWidgetVersion(it, local_path)
|
|
444
444
|
|
|
445
445
|
# 如果daemon之前在运行且应该启动,则重启
|
|
446
446
|
if daemon_manager_instance and daemon_status.get("running", False):
|
|
@@ -501,7 +501,7 @@ def installWidget(name):
|
|
|
501
501
|
widgetReInstall(name, package_url, local_path)
|
|
502
502
|
widgetInstallNotify(name, remote_version)
|
|
503
503
|
addWidgetToEnv(name, True)
|
|
504
|
-
store.
|
|
504
|
+
store.updateWidgetInfo(widgetid, local_path)
|
|
505
505
|
print(f"成功安装 {name} {remote_version}")
|
|
506
506
|
else:
|
|
507
507
|
print(f"本地已是最新版本 {remote_version}")
|
|
@@ -134,15 +134,28 @@ def enableWidget(widget_id):
|
|
|
134
134
|
unblock_one(widget_id)
|
|
135
135
|
sp.write(read_data)
|
|
136
136
|
|
|
137
|
-
def
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
137
|
+
def updateWidgetInfo(widget_id, local_path):
|
|
138
|
+
try:
|
|
139
|
+
sp = Store()
|
|
140
|
+
read_data = sp.read()
|
|
141
|
+
|
|
142
|
+
with open(os.path.join(local_path, 'config.json'), 'r', encoding='UTF-8') as f:
|
|
143
|
+
data = json.load(f)
|
|
144
|
+
version = data["version"]
|
|
145
|
+
if "max_task_number" in data:
|
|
146
|
+
max_task_number = data["max_task_number"]
|
|
147
|
+
else:
|
|
148
|
+
max_task_number = 1
|
|
149
|
+
|
|
150
|
+
if "widgets" not in read_data or not isinstance(read_data["widgets"], dict):
|
|
151
|
+
read_data["widgets"] = {}
|
|
152
|
+
widgetsMap = read_data["widgets"]
|
|
153
|
+
if widget_id in widgetsMap:
|
|
154
|
+
widgetsMap[widget_id]["version"] = version
|
|
155
|
+
widgetsMap[widget_id]["max_task_number"] = max_task_number
|
|
156
|
+
sp.write(read_data)
|
|
157
|
+
except:
|
|
158
|
+
pass
|
|
146
159
|
#============================== device id ================================
|
|
147
160
|
|
|
148
161
|
def writeDeviceInfo(data):
|
|
@@ -164,7 +177,7 @@ def extend():
|
|
|
164
177
|
_genExtend()
|
|
165
178
|
elif read_data["extend"].get("device_id", "") != read_data.get("deviceInfo", {}).get("device_id", ""):
|
|
166
179
|
_genExtend()
|
|
167
|
-
elif read_data["extend"].get("app", "") == "ryry-cli 6.
|
|
180
|
+
elif read_data["extend"].get("app", "") == "ryry-cli 6.10":
|
|
168
181
|
_genExtend()
|
|
169
182
|
else:
|
|
170
183
|
_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
|
|
File without changes
|