ryry-cli 2.42__tar.gz → 2.44__tar.gz

{ryry_cli-2.42 → ryry_cli-2.44}/PKG-INFO

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

ryry_cli-2.44/ryry/constant.py

@@ -0,0 +1,5 @@
+#!!!!! do not change this file !!!!!
+app_version="2.44"
+app_bulld_number=244
+app_bulld_anchor="Noh_2024-08-29 18:59:29.332549"
+app_name="ryry-cli"

{ryry_cli-2.42 → ryry_cli-2.44}/ryry/ryry_widget.py

@@ -168,9 +168,8 @@ def addWidgetToEnv(root, mute=False):
         version = package.version
         root = os.path.join(package.location, name.replace("-", "_"))
     except:
-        root = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), root.replace("-", "_"))
         pass
-    print(root)
+    
     if CheckWidgetDataInPath(root) == False:
         return
     data = GetWidgetConfig(root)

{ryry_cli-2.42 → ryry_cli-2.44}/ryry/server_func.py

@@ -23,7 +23,7 @@ class TaskThread(Thread):
     params = False
     idx = 0
     call_back = None
-    def __init__(self, idx, total, func, params, callback):
+    def __init__(self, idx, total, func, params, callback, timeout=3600):
         super().__init__()
         self.idx = idx
         self.total = total
@@ -32,6 +32,7 @@ class TaskThread(Thread):
         self.checking = False
         self.checkCount = 0
         self.params = params
+        self.timeout = timeout
         self.call_back = callback
         if self.call_back == None:
             raise Exception("need callback function")
@@ -45,7 +46,7 @@ class TaskThread(Thread):
             if cmd:
                 self.checkUUID = "local_" + ''.join(str(uuid.uuid4()).split('-'))
                 self.params["task_id"] = self.checkUUID
-                executeSuccess, result_obj = task.executeLocalPython(self.checkUUID, cmd, self.params)
+                executeSuccess, result_obj = task.executeLocalPython(self.checkUUID, cmd, self.params, self.timeout)
                 if executeSuccess and result_obj["status"] == 0:
                     self.call_back(self.idx, result_obj["result"])
                 return
@@ -79,7 +80,7 @@ class Task:
     urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
     thread_data = {}
     
-    def __init__(self, func: str, multi_params: list[dict], fromUUID=""):
+    def __init__(self, func: str, multi_params: list[dict], fromUUID="", timeout=3600):
         self.thread_data = {}
         
         realTaskUUID = fromUUID
@@ -98,7 +99,7 @@ class Task:
             param["fromUUID"] = realTaskUUID
             param["domain"] = domain
             self.thread_data[str(idx)] = {
-                "thread" :  TaskThread(idx, len(multi_params), func, param, _callback),
+                "thread" :  TaskThread(idx, len(multi_params), func, param, _callback, timeout),
                 "result" : None
             }
             idx+=1

{ryry_cli-2.42 → ryry_cli-2.44}/ryry_cli.egg-info/PKG-INFO

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

{ryry_cli-2.42 → ryry_cli-2.44}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "2.42"
+ryry_version = "2.44"
 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.42/ryry/constant.py

@@ -1,5 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.42"
-app_bulld_number=242
-app_bulld_anchor="Noh_2024-08-26 21:56:46.961109"
-app_name="ryry-cli"