ryry-cli 2.4__tar.gz → 2.5__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-2.4/ryry_cli.egg-info → ryry_cli-2.5}/PKG-INFO +1 -1
- ryry_cli-2.5/ryry/constant.py +5 -0
- {ryry_cli-2.4 → ryry_cli-2.5}/ryry/ryry_server_socket.py +5 -5
- {ryry_cli-2.4 → ryry_cli-2.5}/ryry/ryry_service.py +2 -3
- {ryry_cli-2.4 → ryry_cli-2.5}/ryry/ryry_widget.py +1 -1
- {ryry_cli-2.4 → ryry_cli-2.5/ryry_cli.egg-info}/PKG-INFO +1 -1
- {ryry_cli-2.4 → ryry_cli-2.5}/setup.py +2 -2
- ryry_cli-2.4/ryry/constant.py +0 -5
- {ryry_cli-2.4 → ryry_cli-2.5}/LICENSE +0 -0
- {ryry_cli-2.4 → ryry_cli-2.5}/README.md +0 -0
- {ryry_cli-2.4 → ryry_cli-2.5}/ryry/__init__.py +0 -0
- {ryry_cli-2.4 → ryry_cli-2.5}/ryry/main.py +0 -0
- {ryry_cli-2.4 → ryry_cli-2.5}/ryry/ryry_webapi.py +0 -0
- {ryry_cli-2.4 → ryry_cli-2.5}/ryry/script_template/__init__.py +0 -0
- {ryry_cli-2.4 → ryry_cli-2.5}/ryry/script_template/main.py +0 -0
- {ryry_cli-2.4 → ryry_cli-2.5}/ryry/script_template/run.py +0 -0
- {ryry_cli-2.4 → ryry_cli-2.5}/ryry/server_func.py +0 -0
- {ryry_cli-2.4 → ryry_cli-2.5}/ryry/store.py +0 -0
- {ryry_cli-2.4 → ryry_cli-2.5}/ryry/task.py +0 -0
- {ryry_cli-2.4 → ryry_cli-2.5}/ryry/taskUtils.py +0 -0
- {ryry_cli-2.4 → ryry_cli-2.5}/ryry/upload.py +0 -0
- {ryry_cli-2.4 → ryry_cli-2.5}/ryry/utils.py +0 -0
- {ryry_cli-2.4 → ryry_cli-2.5}/ryry_cli.egg-info/SOURCES.txt +0 -0
- {ryry_cli-2.4 → ryry_cli-2.5}/ryry_cli.egg-info/dependency_links.txt +0 -0
- {ryry_cli-2.4 → ryry_cli-2.5}/ryry_cli.egg-info/entry_points.txt +0 -0
- {ryry_cli-2.4 → ryry_cli-2.5}/ryry_cli.egg-info/requires.txt +0 -0
- {ryry_cli-2.4 → ryry_cli-2.5}/ryry_cli.egg-info/top_level.txt +0 -0
- {ryry_cli-2.4 → ryry_cli-2.5}/setup.cfg +0 -0
|
@@ -18,7 +18,7 @@ from ryry import taskUtils
|
|
|
18
18
|
|
|
19
19
|
thisFileDir = os.path.dirname(os.path.abspath(__file__))
|
|
20
20
|
|
|
21
|
-
class
|
|
21
|
+
class RyryTaskExecutor(Thread):
|
|
22
22
|
THEADING_LIST = []
|
|
23
23
|
max_counter = 1
|
|
24
24
|
cur_counter = 0
|
|
@@ -43,7 +43,7 @@ class ryryTaskExecutorThread(Thread):
|
|
|
43
43
|
|
|
44
44
|
def __init__(self):
|
|
45
45
|
threading.Thread.__init__(self)
|
|
46
|
-
self.name = f"
|
|
46
|
+
self.name = f"RyryTaskExecutor"
|
|
47
47
|
self.task_queue = queue.Queue()
|
|
48
48
|
self.max_counter = store.get_multithread()
|
|
49
49
|
self.is_running = True
|
|
@@ -148,13 +148,13 @@ def _getTaskConfig():
|
|
|
148
148
|
lock.release()
|
|
149
149
|
return task_config
|
|
150
150
|
|
|
151
|
-
class
|
|
151
|
+
class RyryShortConnectThread(Thread):
|
|
152
152
|
is_running = False
|
|
153
|
-
executor:
|
|
153
|
+
executor: RyryTaskExecutor = None
|
|
154
154
|
|
|
155
155
|
def __init__(self, executor):
|
|
156
156
|
super().__init__()
|
|
157
|
-
self.name = f"
|
|
157
|
+
self.name = f"RyryShortConnectThread"
|
|
158
158
|
self.is_running = True
|
|
159
159
|
self.executor = executor
|
|
160
160
|
self.start()
|
|
@@ -77,10 +77,9 @@ class ryryService:
|
|
|
77
77
|
store.writeDeviceInfo(utils.deviceInfo())
|
|
78
78
|
TaskConnector._clearTask()
|
|
79
79
|
#2: service step
|
|
80
|
-
executor = TaskConnector.
|
|
80
|
+
executor = TaskConnector.RyryTaskExecutor()
|
|
81
81
|
self.THEADING_LIST.append(executor)
|
|
82
|
-
|
|
83
|
-
self.THEADING_LIST.append(TaskConnector.ryryShortConnectThread(executor))
|
|
82
|
+
self.THEADING_LIST.append(TaskConnector.RyryShortConnectThread(executor))
|
|
84
83
|
self.THEADING_LIST.append(ryryStateThread())
|
|
85
84
|
self.THEADING_LIST.append(ryryPackageThread())
|
|
86
85
|
#3: service step
|
|
@@ -3,7 +3,7 @@ import os
|
|
|
3
3
|
import subprocess
|
|
4
4
|
import datetime
|
|
5
5
|
|
|
6
|
-
ryry_version = "2.
|
|
6
|
+
ryry_version = "2.5"
|
|
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")
|
|
@@ -24,7 +24,7 @@ app_name="ryry-cli"
|
|
|
24
24
|
except:
|
|
25
25
|
with open(constanspy, 'w') as f:
|
|
26
26
|
f.write(f'''#!!!!! do not change this file !!!!!
|
|
27
|
-
app_version="
|
|
27
|
+
app_version="{ryry_version}"
|
|
28
28
|
app_bulld_number=1
|
|
29
29
|
app_bulld_anchor=""
|
|
30
30
|
app_name="ryry-cli"
|
ryry_cli-2.4/ryry/constant.py
DELETED
|
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
|