ryry-cli 2.3__tar.gz → 2.5__tar.gz

{ryry_cli-2.3/ryry_cli.egg-info → ryry_cli-2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 2.3
+Version: 2.5
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen

ryry_cli-2.5/ryry/constant.py

@@ -0,0 +1,5 @@
+#!!!!! do not change this file !!!!!
+app_version="2.5"
+app_bulld_number=25
+app_bulld_anchor="Noh_2024-05-25 15:49:35.841368"
+app_name="ryry-cli"

{ryry_cli-2.3 → ryry_cli-2.5}/ryry/ryry_server_socket.py

@@ -18,7 +18,7 @@ from ryry import taskUtils
 
 thisFileDir = os.path.dirname(os.path.abspath(__file__))
 
-class ryryTaskExecutorThread(Thread):
+class RyryTaskExecutor(Thread):
     THEADING_LIST = []
     max_counter = 1
     cur_counter = 0
@@ -43,7 +43,7 @@ class ryryTaskExecutorThread(Thread):
     
     def __init__(self):
         threading.Thread.__init__(self)
-        self.name = f"ryryTaskExecutorThread"
+        self.name = f"RyryTaskExecutor"
         self.task_queue = queue.Queue()
         self.max_counter = store.get_multithread()
         self.is_running = True
@@ -148,13 +148,13 @@ def _getTaskConfig():
     lock.release() 
     return task_config
 
-class ryryShortConnectThread(Thread):
+class RyryShortConnectThread(Thread):
     is_running = False
-    executor: ryryTaskExecutorThread = None
+    executor: RyryTaskExecutor = None
 
     def __init__(self, executor):
         super().__init__()
-        self.name = f"ryryShortConnectThread"
+        self.name = f"RyryShortConnectThread"
         self.is_running = True
         self.executor = executor
         self.start()

{ryry_cli-2.3 → ryry_cli-2.5}/ryry/ryry_service.py

@@ -77,10 +77,9 @@ class ryryService:
         store.writeDeviceInfo(utils.deviceInfo())
         TaskConnector._clearTask()
         #2: service step
-        executor = TaskConnector.ryryTaskExecutorThread()
+        executor = TaskConnector.RyryTaskExecutor()
         self.THEADING_LIST.append(executor)
-        for _ in range(0, threadNum):
-            self.THEADING_LIST.append(TaskConnector.ryryShortConnectThread(executor))
+        self.THEADING_LIST.append(TaskConnector.RyryShortConnectThread(executor))
         self.THEADING_LIST.append(ryryStateThread())
         self.THEADING_LIST.append(ryryPackageThread())
         #3: service step

{ryry_cli-2.3 → ryry_cli-2.5}/ryry/ryry_widget.py

@@ -125,7 +125,7 @@ def setWidgetData(root, widgetid):
     data = GetWidgetConfig(root)
     data["widget_id"] = widgetid
     data["name"] = "Demo"
-    data["version"] = "2.3"
+    data["version"] = "2.5"
     data["device_keys"] = [
         utils.generate_unique_id()
     ]

{ryry_cli-2.3 → ryry_cli-2.5}/ryry/utils.py

@@ -134,11 +134,16 @@ def deviceInfo():
     cpu_serial = "" if cpu_serial == None else cpu_serial
     hostname = get_hostname()
     M=1024*1024
+    cpu_freq = "None"
+    try:
+        cpu_freq = psutil.cpu_freq().max / 1000
+    except:
+        pass
     data = {
         "cpu": {
             "logical_count" : psutil.cpu_count(),
             "count" : psutil.cpu_count(logical=False),
-            "max_freq" : f"{psutil.cpu_freq().max / 1000} GHz",
+            "max_freq" : f"{cpu_freq} GHz",
         },
         "memory": {
             "total" : f"{psutil.virtual_memory().total/M} M",

{ryry_cli-2.3 → ryry_cli-2.5/ryry_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 2.3
+Version: 2.5
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen

{ryry_cli-2.3 → ryry_cli-2.5}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "2.3"
+ryry_version = "2.5"
 ryry_build_number = int(ryry_version.replace(".",""))
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")
@@ -24,7 +24,7 @@ app_name="ryry-cli"
 except:
     with open(constanspy, 'w') as f:
         f.write(f'''#!!!!! do not change this file !!!!!
-app_version="2.3"
+app_version="{ryry_version}"
 app_bulld_number=1
 app_bulld_anchor=""
 app_name="ryry-cli"

ryry_cli-2.3/ryry/constant.py

@@ -1,5 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.3"
-app_bulld_number=23
-app_bulld_anchor="Noh_2024-05-24 21:42:15.321797"
-app_name="ryry-cli"