ryry-cli 5.3__tar.gz → 5.4__tar.gz

{ryry_cli-5.3/ryry_cli.egg-info → ryry_cli-5.4}/PKG-INFO

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

{ryry_cli-5.3 → ryry_cli-5.4}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="5.3"
-app_bulld_anchor="Noh_2025-09-28 18:49:54.075325"
+app_version="5.4"
+app_bulld_anchor="Noh_2025-09-28 22:05:40.262632"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-5.3 → ryry_cli-5.4}/ryry/server_func.py

@@ -1,7 +1,7 @@
 import time, urllib3, sys, os, uuid, json
 from threading import Thread, Lock
 
-from ryry import ryry_webapi, upload, taskUtils, task, constant
+from ryry import ryry_webapi, upload, taskUtils, task, constant, ryry_service
 
 lock = Lock()
 def print_progress_bar(iteration, total, name, idx, total_bars):
@@ -43,8 +43,17 @@ class TaskThread(Thread):
             self.checkCount = 0
             wait_time_step = 5
             cmd = task.cmdWithWidgetName(self.func)
-            if cmd:
-                self.checkUUID = ryry_webapi.createLocalTask(self.func, self.params, self.timeout)
+            
+            if cmd:    
+                if not ryry_service.ryryService().is_running():
+                    self.checkUUID = "local_" + ''.join(str(uuid.uuid4()).split('-'))
+                    self.params["task_id"] = self.checkUUID
+                    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
+                else:
+                    self.checkUUID = ryry_webapi.createLocalTask(self.func, self.params, self.timeout)
             else:
                 self.checkUUID = ryry_webapi.createTask(self.func, self.params)
             time.sleep(wait_time_step)

{ryry_cli-5.3 → ryry_cli-5.4}/ryry/store.py

@@ -155,7 +155,7 @@ def extend():
                 _genExtend()
             elif read_data["extend"].get("device_id", "") != read_data.get("deviceInfo", {}).get("device_id", ""):
                 _genExtend()
-            elif read_data["extend"].get("app", "") == "ryry-cli 5.3":
+            elif read_data["extend"].get("app", "") == "ryry-cli 5.4":
                 _genExtend()
         else:
             _genExtend()

{ryry_cli-5.3 → ryry_cli-5.4}/ryry/upload.py

@@ -345,7 +345,6 @@ FTP_REPLACEMENT = {
     "192.168.50.12": "219.136.123.179",
     "219.136.123.179": "192.168.50.12",
     "183.6.90.205": "219.136.123.179",
-    "183.6.90.205": "192.168.50.12",
 }
 
 SUBDOMAIN = {
@@ -678,4 +677,4 @@ def downloadDir(url, saveDir, useCount=-1, autoDelete=False):
             print(f"url {url} not support")
     except Exception as e:
         print(f"downloadDir fail: {e}")
-    return None
+    return None

{ryry_cli-5.3 → ryry_cli-5.4/ryry_cli.egg-info}/PKG-INFO

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

{ryry_cli-5.3 → ryry_cli-5.4}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "5.3"
+ryry_version = "5.4"
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")
 try: