ryry-cli 2.24__tar.gz → 2.27__tar.gz

{ryry_cli-2.24/ryry_cli.egg-info → ryry_cli-2.27}/PKG-INFO

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

ryry_cli-2.27/ryry/constant.py

@@ -0,0 +1,5 @@
+#!!!!! do not change this file !!!!!
+app_version="2.27"
+app_bulld_number=227
+app_bulld_anchor="Noh_2024-08-08 14:50:11.855975"
+app_name="ryry-cli"

{ryry_cli-2.24 → ryry_cli-2.27}/ryry/ryry_server_socket.py

@@ -166,15 +166,32 @@ class RyryShortConnectThread(Thread):
 
     def run(self):
         print(f"   {self.name} start")
-        what_time = 2
+        min_wait_time = 2
+        max_wait_time = 10
+        wait_time = min_wait_time
+        consecutive_step = 2
+        consecutive_failures = 0
+        max_consecutive_failures = 10
+        
         while (self.is_running):
             try:
                 datas = ryry_webapi.GetTask()
                 for it in datas:
                     self.executor.appendTask(it, self.taskCallback)
+                    
+                # if task empty -> full, set wait_time = max -> min
+                if len(datas) > 0:
+                    consecutive_failures = 0
+                    wait_time = max(min_wait_time, wait_time - consecutive_step)
+                else:
+                    consecutive_failures += 1
+                    if consecutive_failures >= max_consecutive_failures:
+                        wait_time = min(max_wait_time, wait_time + consecutive_step)
+                        consecutive_failures = 0
             except Exception as ex:
                 taskUtils.taskPrint(None, f"{self.name} === exception : {ex}")
-            time.sleep(what_time)
+            time.sleep(wait_time)
+            
         print(f"   {self.name} stop")
 
     def markStop(self):

{ryry_cli-2.24 → ryry_cli-2.27}/ryry/ryry_widget.py

@@ -126,9 +126,6 @@ def setWidgetData(root, widgetid):
     data["widget_id"] = widgetid
     data["name"] = "Demo"
     data["version"] = "1.0"
-    data["device_keys"] = [
-        utils.generate_unique_id()
-    ]
     data["cmd"] = os.path.join(root, "main.py")
     with open(os.path.join(root, "config.json"), 'w') as f:
         json.dump(data, f)

{ryry_cli-2.24 → ryry_cli-2.27}/ryry/store.py

@@ -67,10 +67,13 @@ def insertWidget(widget_id, path):
     if "widgets" not in read_data:
         read_data["widgets"] = {}
     widgetsMap = read_data["widgets"]
-    widgetsMap[widget_id] = {
-        "isBlock": False,
-        "path" : path
-    }
+    if widget_id in widgetsMap:
+        widgetsMap[widget_id]["path"] = path
+    else:
+        widgetsMap[widget_id] = {
+            "isBlock": False,
+            "path" : path
+        }
     for k in list(widgetsMap.keys()):
         if isinstance(widgetsMap[k], (dict)):
             if os.path.exists(widgetsMap[k]["path"]) == False:

{ryry_cli-2.24 → ryry_cli-2.27/ryry_cli.egg-info}/PKG-INFO

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

{ryry_cli-2.24 → ryry_cli-2.27}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "2.24"
+ryry_version = "2.27"
 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")

ryry_cli-2.24/ryry/constant.py

@@ -1,5 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.24"
-app_bulld_number=224
-app_bulld_anchor="Noh_2024-07-18 19:54:46.190007"
-app_name="ryry-cli"