ryry-cli 6.11__tar.gz → 6.13__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.11/ryry_cli.egg-info → ryry_cli-6.13}/PKG-INFO +1 -1
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry/constant.py +2 -2
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry/ryry_server_socket.py +2 -2
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry/server_func.py +0 -1
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry/shared_memory.py +0 -2
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry/store.py +1 -1
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry/taskUtils.py +1 -0
- {ryry_cli-6.11 → ryry_cli-6.13/ryry_cli.egg-info}/PKG-INFO +1 -1
- {ryry_cli-6.11 → ryry_cli-6.13}/setup.py +1 -1
- {ryry_cli-6.11 → ryry_cli-6.13}/LICENSE +0 -0
- {ryry_cli-6.11 → ryry_cli-6.13}/README.md +0 -0
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry/__init__.py +0 -0
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry/daemon_base.py +0 -0
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry/daemon_manager.py +0 -0
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry/main.py +0 -0
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry/proxy_manager.py +0 -0
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry/ryry_service.py +0 -0
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry/ryry_webapi.py +0 -0
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry/ryry_widget.py +0 -0
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry/script_template/__init__.py +0 -0
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry/script_template/daemon.py +0 -0
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry/script_template/main.py +0 -0
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry/script_template/run.py +0 -0
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry/task.py +0 -0
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry/upload.py +0 -0
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry/utils.py +0 -0
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry_cli.egg-info/SOURCES.txt +0 -0
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry_cli.egg-info/dependency_links.txt +0 -0
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry_cli.egg-info/entry_points.txt +0 -0
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry_cli.egg-info/requires.txt +0 -0
- {ryry_cli-6.11 → ryry_cli-6.13}/ryry_cli.egg-info/top_level.txt +0 -0
- {ryry_cli-6.11 → ryry_cli-6.13}/setup.cfg +0 -0
|
@@ -244,10 +244,10 @@ class RyryShortConnectThread(Thread):
|
|
|
244
244
|
for it in map:
|
|
245
245
|
if isinstance(map[it], (dict)):
|
|
246
246
|
if map[it]["isBlock"] == False and self.executor.widgetHasPower(it):
|
|
247
|
-
widget_list[it] = map[it]
|
|
247
|
+
widget_list[it] = map[it].get("version", "0.0")
|
|
248
248
|
else:
|
|
249
249
|
if self.executor.widgetHasPower(it):
|
|
250
|
-
widget_list[it] = map[it]
|
|
250
|
+
widget_list[it] = map[it].get("version", "0.0")
|
|
251
251
|
datas = ryry_webapi.GetTask(widget_list)
|
|
252
252
|
for it in datas:
|
|
253
253
|
self.executor.appendTask(it, self.taskCallback)
|
|
@@ -49,7 +49,6 @@ class TaskThread(Thread):
|
|
|
49
49
|
self.checkUUID = "local_" + ''.join(str(uuid.uuid4()).split('-'))
|
|
50
50
|
self.params["task_id"] = self.checkUUID
|
|
51
51
|
executeSuccess, result_obj = task.executeLocalPython(self.checkUUID, cmd, self.params, self.timeout)
|
|
52
|
-
print(f"============={result_obj}")
|
|
53
52
|
if executeSuccess and result_obj["status"] == 0:
|
|
54
53
|
self.call_back(self.idx, result_obj["result"])
|
|
55
54
|
return
|
|
@@ -541,7 +541,6 @@ class SharedMemoryService:
|
|
|
541
541
|
"""获取最大计数器(只读操作)"""
|
|
542
542
|
data = self._read_data()
|
|
543
543
|
max_counter = data.get("max_counter", 1)
|
|
544
|
-
print(f"get_max_counter = {max_counter}")
|
|
545
544
|
return max_counter
|
|
546
545
|
|
|
547
546
|
def set_cur_counter(self, cur_counter: int):
|
|
@@ -556,7 +555,6 @@ class SharedMemoryService:
|
|
|
556
555
|
"""获取当前计数器(只读操作)"""
|
|
557
556
|
data = self._read_data()
|
|
558
557
|
cur_counter = data.get("cur_counter", 0)
|
|
559
|
-
print(f"get_cur_counter = {cur_counter}")
|
|
560
558
|
return cur_counter
|
|
561
559
|
|
|
562
560
|
def increment_cur_counter(self) -> int:
|
|
@@ -177,7 +177,7 @@ def extend():
|
|
|
177
177
|
_genExtend()
|
|
178
178
|
elif read_data["extend"].get("device_id", "") != read_data.get("deviceInfo", {}).get("device_id", ""):
|
|
179
179
|
_genExtend()
|
|
180
|
-
elif read_data["extend"].get("app", "") == "ryry-cli 6.
|
|
180
|
+
elif read_data["extend"].get("app", "") == "ryry-cli 6.13":
|
|
181
181
|
_genExtend()
|
|
182
182
|
else:
|
|
183
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
|