ryry-cli 6.7__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.
Files changed (32) hide show
  1. {ryry_cli-6.7/ryry_cli.egg-info → ryry_cli-6.10}/PKG-INFO +1 -1
  2. {ryry_cli-6.7 → ryry_cli-6.10}/ryry/constant.py +2 -2
  3. {ryry_cli-6.7 → ryry_cli-6.10}/ryry/ryry_widget.py +2 -1
  4. {ryry_cli-6.7 → ryry_cli-6.10}/ryry/store.py +23 -10
  5. {ryry_cli-6.7 → ryry_cli-6.10/ryry_cli.egg-info}/PKG-INFO +1 -1
  6. {ryry_cli-6.7 → ryry_cli-6.10}/setup.py +1 -1
  7. {ryry_cli-6.7 → ryry_cli-6.10}/LICENSE +0 -0
  8. {ryry_cli-6.7 → ryry_cli-6.10}/README.md +0 -0
  9. {ryry_cli-6.7 → ryry_cli-6.10}/ryry/__init__.py +0 -0
  10. {ryry_cli-6.7 → ryry_cli-6.10}/ryry/daemon_base.py +0 -0
  11. {ryry_cli-6.7 → ryry_cli-6.10}/ryry/daemon_manager.py +0 -0
  12. {ryry_cli-6.7 → ryry_cli-6.10}/ryry/main.py +0 -0
  13. {ryry_cli-6.7 → ryry_cli-6.10}/ryry/proxy_manager.py +0 -0
  14. {ryry_cli-6.7 → ryry_cli-6.10}/ryry/ryry_server_socket.py +0 -0
  15. {ryry_cli-6.7 → ryry_cli-6.10}/ryry/ryry_service.py +0 -0
  16. {ryry_cli-6.7 → ryry_cli-6.10}/ryry/ryry_webapi.py +0 -0
  17. {ryry_cli-6.7 → ryry_cli-6.10}/ryry/script_template/__init__.py +0 -0
  18. {ryry_cli-6.7 → ryry_cli-6.10}/ryry/script_template/daemon.py +0 -0
  19. {ryry_cli-6.7 → ryry_cli-6.10}/ryry/script_template/main.py +0 -0
  20. {ryry_cli-6.7 → ryry_cli-6.10}/ryry/script_template/run.py +0 -0
  21. {ryry_cli-6.7 → ryry_cli-6.10}/ryry/server_func.py +0 -0
  22. {ryry_cli-6.7 → ryry_cli-6.10}/ryry/shared_memory.py +0 -0
  23. {ryry_cli-6.7 → ryry_cli-6.10}/ryry/task.py +0 -0
  24. {ryry_cli-6.7 → ryry_cli-6.10}/ryry/taskUtils.py +0 -0
  25. {ryry_cli-6.7 → ryry_cli-6.10}/ryry/upload.py +0 -0
  26. {ryry_cli-6.7 → ryry_cli-6.10}/ryry/utils.py +0 -0
  27. {ryry_cli-6.7 → ryry_cli-6.10}/ryry_cli.egg-info/SOURCES.txt +0 -0
  28. {ryry_cli-6.7 → ryry_cli-6.10}/ryry_cli.egg-info/dependency_links.txt +0 -0
  29. {ryry_cli-6.7 → ryry_cli-6.10}/ryry_cli.egg-info/entry_points.txt +0 -0
  30. {ryry_cli-6.7 → ryry_cli-6.10}/ryry_cli.egg-info/requires.txt +0 -0
  31. {ryry_cli-6.7 → ryry_cli-6.10}/ryry_cli.egg-info/top_level.txt +0 -0
  32. {ryry_cli-6.7 → ryry_cli-6.10}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: ryry-cli
3
- Version: 6.7
3
+ Version: 6.10
4
4
  Summary: ryry tools
5
5
  Home-page: https://github.com/dalipenMedia
6
6
  Author: dalipen
@@ -1,6 +1,6 @@
1
1
  #!!!!! do not change this file !!!!!
2
- app_version="6.7"
3
- app_bulld_anchor="Noh_2025-11-13 20:55:56.827377"
2
+ app_version="6.10"
3
+ app_bulld_anchor="Noh_2025-11-13 21:23:08.201763"
4
4
  app_name="ryry-cli"
5
5
  import sys, os
6
6
  if getattr(sys, 'frozen', False):
@@ -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, remote_version)
443
+ store.updateWidgetVersion(it, local_path)
444
444
 
445
445
  # 如果daemon之前在运行且应该启动,则重启
446
446
  if daemon_manager_instance and daemon_status.get("running", False):
@@ -501,6 +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.updateWidgetInfo(widgetid, local_path)
504
505
  print(f"成功安装 {name} {remote_version}")
505
506
  else:
506
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 updateWidgetVersion(widget_id, version):
138
- sp = Store()
139
- read_data = sp.read()
140
- if "widgets" not in read_data or not isinstance(read_data["widgets"], dict):
141
- read_data["widgets"] = {}
142
- widgetsMap = read_data["widgets"]
143
- if widget_id in widgetsMap:
144
- widgetsMap[widget_id]["version"] = version
145
- sp.write(read_data)
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.7":
180
+ elif read_data["extend"].get("app", "") == "ryry-cli 6.10":
168
181
  _genExtend()
169
182
  else:
170
183
  _genExtend()
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: ryry-cli
3
- Version: 6.7
3
+ Version: 6.10
4
4
  Summary: ryry tools
5
5
  Home-page: https://github.com/dalipenMedia
6
6
  Author: dalipen
@@ -3,7 +3,7 @@ import os
3
3
  import subprocess
4
4
  import datetime
5
5
 
6
- ryry_version = "6.7"
6
+ ryry_version = "6.10"
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:
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