ryry-cli 2.4__tar.gz → 2.6__tar.gz

{ryry_cli-2.4/ryry_cli.egg-info → ryry_cli-2.6}/PKG-INFO

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

ryry_cli-2.6/ryry/constant.py

@@ -0,0 +1,5 @@
+#!!!!! do not change this file !!!!!
+app_version="2.6"
+app_bulld_number=26
+app_bulld_anchor="Noh_2024-05-25 19:57:53.348031"
+app_name="ryry-cli"

{ryry_cli-2.4 → ryry_cli-2.6}/ryry/main.py

@@ -277,6 +277,7 @@ def widget():
         print("Unknown command:", command)
 
 def main():
+    urllib3.disable_warnings()
     urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
     if len(sys.argv) >= 2:

{ryry_cli-2.4 → ryry_cli-2.6}/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.4 → ryry_cli-2.6}/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.4 → ryry_cli-2.6}/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.4"
+    data["version"] = "1.0"
     data["device_keys"] = [
         utils.generate_unique_id()
     ]
@@ -225,8 +225,14 @@ def publishWidget(package_folder):
         
     data = GetWidgetConfig(package_folder)
     widget_id = data["widget_id"]
-    name = data["name"]
-    local_version = data["version"]
+    name = None
+    if "name" in data:
+        name = data["name"]
+    if "py_package" in data:
+        name = data["py_package"]
+    local_version = "1.0"
+    if "version" in data:
+        local_version = data["version"]
     user_id = utils.generate_unique_id()
         
     #if in h5&script parent folder, add env path
@@ -260,6 +266,10 @@ def publishWidget(package_folder):
         with open(config_json_file, 'r') as f:
             cc = json.load(f)
         cc["py_package"] = name
+        cc["name"] = name
+        cc["version"] = local_version
+        with open(config_json_file, 'w') as f:
+            json.dump(cc, f)
     if os.path.exists(os.path.join(pip_source_dir, "__init__.py")) == False:
         with open(os.path.join(pip_source_dir, "__init__.py"), 'w') as f:
             f.write("")

{ryry_cli-2.4 → ryry_cli-2.6}/ryry/server_func.py

@@ -1,4 +1,4 @@
-import time
+import time, urllib3
 from threading import Thread
 
 from ryry import ryry_webapi
@@ -36,6 +36,8 @@ class TaskThread(Thread):
                         self.call_back(self.idx, data)
                         return
                 checkCount += 1
+                if checkCount % 10 == 0:
+                    print(f"waiting...")
                 time.sleep(1)
         else:
             print(f"widget {self.func}-{self.widgetid} not found")
@@ -45,6 +47,9 @@ class Task:
     thread_data = {}
 
     def __init__(self, func: str, multi_params: list[dict], fromUUID=None, func_id=None):
+        urllib3.disable_warnings()
+        urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+        
         realTaskUUID = fromUUID
         if realTaskUUID == None or len(realTaskUUID) <= 0:
             realTaskUUID = taskUtils.taskInfoWithFirstTask()

{ryry_cli-2.4 → ryry_cli-2.6/ryry_cli.egg-info}/PKG-INFO

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

{ryry_cli-2.4 → ryry_cli-2.6}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "2.4"
+ryry_version = "2.6"
 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.4"
+app_version="{ryry_version}"
 app_bulld_number=1
 app_bulld_anchor=""
 app_name="ryry-cli"

ryry_cli-2.4/ryry/constant.py

@@ -1,5 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.4"
-app_bulld_number=24
-app_bulld_anchor="Noh_2024-05-25 15:01:05.475906"
-app_name="ryry-cli"