ryry-cli 2.22__tar.gz → 2.24__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 (28) hide show
  1. {ryry_cli-2.22/ryry_cli.egg-info → ryry_cli-2.24}/PKG-INFO +1 -1
  2. ryry_cli-2.24/ryry/constant.py +5 -0
  3. {ryry_cli-2.22 → ryry_cli-2.24}/ryry/ryry_service.py +21 -20
  4. {ryry_cli-2.22 → ryry_cli-2.24}/ryry/ryry_webapi.py +1 -0
  5. {ryry_cli-2.22 → ryry_cli-2.24/ryry_cli.egg-info}/PKG-INFO +1 -1
  6. {ryry_cli-2.22 → ryry_cli-2.24}/setup.py +1 -1
  7. ryry_cli-2.22/ryry/constant.py +0 -5
  8. {ryry_cli-2.22 → ryry_cli-2.24}/LICENSE +0 -0
  9. {ryry_cli-2.22 → ryry_cli-2.24}/README.md +0 -0
  10. {ryry_cli-2.22 → ryry_cli-2.24}/ryry/__init__.py +0 -0
  11. {ryry_cli-2.22 → ryry_cli-2.24}/ryry/main.py +0 -0
  12. {ryry_cli-2.22 → ryry_cli-2.24}/ryry/ryry_server_socket.py +0 -0
  13. {ryry_cli-2.22 → ryry_cli-2.24}/ryry/ryry_widget.py +0 -0
  14. {ryry_cli-2.22 → ryry_cli-2.24}/ryry/script_template/__init__.py +0 -0
  15. {ryry_cli-2.22 → ryry_cli-2.24}/ryry/script_template/main.py +0 -0
  16. {ryry_cli-2.22 → ryry_cli-2.24}/ryry/script_template/run.py +0 -0
  17. {ryry_cli-2.22 → ryry_cli-2.24}/ryry/server_func.py +0 -0
  18. {ryry_cli-2.22 → ryry_cli-2.24}/ryry/store.py +0 -0
  19. {ryry_cli-2.22 → ryry_cli-2.24}/ryry/task.py +0 -0
  20. {ryry_cli-2.22 → ryry_cli-2.24}/ryry/taskUtils.py +0 -0
  21. {ryry_cli-2.22 → ryry_cli-2.24}/ryry/upload.py +0 -0
  22. {ryry_cli-2.22 → ryry_cli-2.24}/ryry/utils.py +0 -0
  23. {ryry_cli-2.22 → ryry_cli-2.24}/ryry_cli.egg-info/SOURCES.txt +0 -0
  24. {ryry_cli-2.22 → ryry_cli-2.24}/ryry_cli.egg-info/dependency_links.txt +0 -0
  25. {ryry_cli-2.22 → ryry_cli-2.24}/ryry_cli.egg-info/entry_points.txt +0 -0
  26. {ryry_cli-2.22 → ryry_cli-2.24}/ryry_cli.egg-info/requires.txt +0 -0
  27. {ryry_cli-2.22 → ryry_cli-2.24}/ryry_cli.egg-info/top_level.txt +0 -0
  28. {ryry_cli-2.22 → ryry_cli-2.24}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: ryry-cli
3
- Version: 2.22
3
+ Version: 2.24
4
4
  Summary: ryry tools
5
5
  Home-page: https://github.com/dalipenMedia
6
6
  Author: dalipen
@@ -0,0 +1,5 @@
1
+ #!!!!! do not change this file !!!!!
2
+ app_version="2.24"
3
+ app_bulld_number=224
4
+ app_bulld_anchor="Noh_2024-07-18 19:54:46.190007"
5
+ app_name="ryry-cli"
@@ -158,26 +158,27 @@ class ryryPackageThread(Thread):
158
158
  except Exception as ex:
159
159
  print(f'update widget fail, {ex}')
160
160
 
161
- try:
162
- #update cli
163
- remote_version = ryry_widget._remote_package_version("ryry-cli")
164
- simple = "https://pypi.python.org/simple/"
165
- local_version = ryry_widget._local_package_version("ryry-cli")
166
- if ryry_widget.compare_versions(remote_version, local_version) > 0:
167
- print("start update progress...")
168
- utils.begin_restart("auto upgrade ryry-cli", True, simple)
169
- device_id = utils.generate_unique_id()
170
- machine_name = socket.gethostname()
171
- ver = get_distribution("ryry-cli").version
172
- taskUtils.notifyWechatRobot({
173
- "msgtype": "text",
174
- "text": {
175
- "content": f"机器<{machine_name}[{device_id}]>[{ver}] ryry-cli开始升级[{local_version}]->[{remote_version}]"
176
- }
177
- })
178
- break
179
- except Exception as ex:
180
- print(f'update ryry-cli fail, {ex}')
161
+ if platform.system() != 'Darwin':
162
+ try:
163
+ #update cli
164
+ remote_version = ryry_widget._remote_package_version("ryry-cli")
165
+ simple = "https://pypi.python.org/simple/"
166
+ local_version = ryry_widget._local_package_version("ryry-cli")
167
+ if ryry_widget.compare_versions(remote_version, local_version) > 0:
168
+ print("start update progress...")
169
+ utils.begin_restart("auto upgrade ryry-cli", True, simple)
170
+ device_id = utils.generate_unique_id()
171
+ machine_name = socket.gethostname()
172
+ ver = get_distribution("ryry-cli").version
173
+ taskUtils.notifyWechatRobot({
174
+ "msgtype": "text",
175
+ "text": {
176
+ "content": f"机器<{machine_name}[{device_id}]>[{ver}] ryry-cli开始升级[{local_version}]->[{remote_version}]"
177
+ }
178
+ })
179
+ break
180
+ except Exception as ex:
181
+ print(f'update ryry-cli fail, {ex}')
181
182
  time.sleep(10)
182
183
  print(f" PackageChecker stop")
183
184
  notify_other_stoped() #because other thread is waiting some signal to close
@@ -58,6 +58,7 @@ def GetTask():
58
58
  req = {
59
59
  "widget_map": json.dumps(widget_map),
60
60
  "limit": 1,
61
+ "extend": _extend()
61
62
  }
62
63
  r1, r2, r3 = _aigc_post("aigc/task/getTask", req)
63
64
  if r1 != 0:
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: ryry-cli
3
- Version: 2.22
3
+ Version: 2.24
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 = "2.22"
6
+ ryry_version = "2.24"
7
7
  ryry_build_number = int(ryry_version.replace(".",""))
8
8
  cur_dir = os.path.dirname(os.path.abspath(__file__))
9
9
  constanspy = os.path.join(cur_dir, "ryry", "constant.py")
@@ -1,5 +0,0 @@
1
- #!!!!! do not change this file !!!!!
2
- app_version="2.22"
3
- app_bulld_number=222
4
- app_bulld_anchor="Noh_2024-07-18 19:00:15.984178"
5
- app_name="ryry-cli"
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