ryry-cli 2.33__tar.gz → 2.35__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.33 → ryry_cli-2.35}/PKG-INFO +1 -1
  2. ryry_cli-2.35/ryry/constant.py +5 -0
  3. {ryry_cli-2.33 → ryry_cli-2.35}/ryry/ryry_server_socket.py +4 -3
  4. {ryry_cli-2.33 → ryry_cli-2.35}/ryry/server_func.py +0 -1
  5. {ryry_cli-2.33 → ryry_cli-2.35}/ryry_cli.egg-info/PKG-INFO +1 -1
  6. {ryry_cli-2.33 → ryry_cli-2.35}/setup.py +1 -1
  7. ryry_cli-2.33/ryry/constant.py +0 -5
  8. {ryry_cli-2.33 → ryry_cli-2.35}/LICENSE +0 -0
  9. {ryry_cli-2.33 → ryry_cli-2.35}/README.md +0 -0
  10. {ryry_cli-2.33 → ryry_cli-2.35}/ryry/__init__.py +0 -0
  11. {ryry_cli-2.33 → ryry_cli-2.35}/ryry/main.py +0 -0
  12. {ryry_cli-2.33 → ryry_cli-2.35}/ryry/ryry_service.py +0 -0
  13. {ryry_cli-2.33 → ryry_cli-2.35}/ryry/ryry_webapi.py +0 -0
  14. {ryry_cli-2.33 → ryry_cli-2.35}/ryry/ryry_widget.py +0 -0
  15. {ryry_cli-2.33 → ryry_cli-2.35}/ryry/script_template/__init__.py +0 -0
  16. {ryry_cli-2.33 → ryry_cli-2.35}/ryry/script_template/main.py +0 -0
  17. {ryry_cli-2.33 → ryry_cli-2.35}/ryry/script_template/run.py +0 -0
  18. {ryry_cli-2.33 → ryry_cli-2.35}/ryry/store.py +0 -0
  19. {ryry_cli-2.33 → ryry_cli-2.35}/ryry/task.py +0 -0
  20. {ryry_cli-2.33 → ryry_cli-2.35}/ryry/taskUtils.py +0 -0
  21. {ryry_cli-2.33 → ryry_cli-2.35}/ryry/upload.py +0 -0
  22. {ryry_cli-2.33 → ryry_cli-2.35}/ryry/utils.py +0 -0
  23. {ryry_cli-2.33 → ryry_cli-2.35}/ryry_cli.egg-info/SOURCES.txt +0 -0
  24. {ryry_cli-2.33 → ryry_cli-2.35}/ryry_cli.egg-info/dependency_links.txt +0 -0
  25. {ryry_cli-2.33 → ryry_cli-2.35}/ryry_cli.egg-info/entry_points.txt +0 -0
  26. {ryry_cli-2.33 → ryry_cli-2.35}/ryry_cli.egg-info/requires.txt +0 -0
  27. {ryry_cli-2.33 → ryry_cli-2.35}/ryry_cli.egg-info/top_level.txt +0 -0
  28. {ryry_cli-2.33 → ryry_cli-2.35}/setup.cfg +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: ryry-cli
3
- Version: 2.33
3
+ Version: 2.35
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.35"
3
+ app_bulld_number=235
4
+ app_bulld_anchor="Noh_2024-08-15 19:33:09.127913"
5
+ app_name="ryry-cli"
@@ -84,10 +84,8 @@ class RyryTaskExecutor(Thread):
84
84
  print(f" {current_thread().name} taskRunning stop")
85
85
 
86
86
  def run(self):
87
- idx = 1
88
- for _ in range(0, self.max_counter):
87
+ for idx in range(0, self.max_counter):
89
88
  self.THEADING_LIST.append(Thread(name=f"exector-{idx}",target=self.taskRunning))
90
- idx+=1
91
89
  for t in self.THEADING_LIST:
92
90
  t.start()
93
91
  while self.is_running:
@@ -180,6 +178,9 @@ class RyryShortConnectThread(Thread):
180
178
 
181
179
  while (self.is_running):
182
180
  try:
181
+ if self.executor.idlePower() == 0:
182
+ time.sleep(1)
183
+ continue
183
184
  datas = ryry_webapi.GetTask()
184
185
  for it in datas:
185
186
  self.executor.appendTask(it, self.taskCallback)
@@ -46,7 +46,6 @@ class TaskThread(Thread):
46
46
  self.checkUUID = "local_" + ''.join(str(uuid.uuid4()).split('-'))
47
47
  self.params["task_id"] = self.checkUUID
48
48
  executeSuccess, result_obj = task.executeLocalPython(self.checkUUID, cmd, self.params)
49
- print("结束 " + result_obj)
50
49
  if executeSuccess and result_obj["status"] == 0:
51
50
  self.call_back(self.idx, result_obj["result"])
52
51
  return
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: ryry-cli
3
- Version: 2.33
3
+ Version: 2.35
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.33"
6
+ ryry_version = "2.35"
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.33"
3
- app_bulld_number=233
4
- app_bulld_anchor="Noh_2024-08-15 15:07:33.090092"
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
File without changes