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

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

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

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

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="5.2"
-app_bulld_anchor="Noh_2025-09-28 18:46:20.763566"
+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.2 → 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.2 → 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.2":
+            elif read_data["extend"].get("app", "") == "ryry-cli 5.4":
                 _genExtend()
         else:
             _genExtend()

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

@@ -215,22 +215,6 @@ def ftpUpload(file, new_file_name, subdomain, upload_path=""):
     import ftplib
     while retry < 3:
         try:
-            #如果ip是外网ip，并且在FTP_REPLACEMENT内有，则先替换成内网ip上传一次
-            if retry == 0 and "192.168" not in ip and ip in FTP_REPLACEMENT:
-                try:
-                    local_network_config = DOMAIN_CONFIG[FTP_REPLACEMENT[ip]]["config"]
-                    ftp = ftplib.FTP()
-                    ftp.connect(local_network_config["host"], local_network_config["port"], timeout=5)
-                    ftp.login(local_network_config["username"], local_network_config["password"])  
-                    if upload_path:
-                        s = deepFtpUpload(file, new_file_name, ftp, upload_path, readpath)
-                    else:
-                        s = deepFtpUpload(file, new_file_name, ftp, writepath, readpath)
-                    ftp.quit()
-                    return s
-                except:
-                    pass
-            
             if retry > 0:
                 has_bak = FTP_REPLACEMENT.get(ip, None)
                 if has_bak:
@@ -297,7 +281,7 @@ ftp_192_168_50_12={
     "writepath" : "cache",
     "readpath" : "ftp://219.136.123.179/mnt/NAS/mcn"
 }
-ftp_183_6_90_205={
+ftp_219_136_123_179={
     "host" : "219.136.123.179",
     "port": 2221,
     "username" : "mcn",
@@ -345,11 +329,11 @@ def get_domain_config(target_domain):
 
 DOMAIN_CONFIG = {
     "192.168.50.12": {"type": "ftp", "config": ftp_192_168_50_12},
-    "219.136.123.179": {"type": "ftp", "config": ftp_183_6_90_205},
-    "183.6.90.205": {"type": "ftp", "config": ftp_183_6_90_205},
+    "219.136.123.179": {"type": "ftp", "config": ftp_219_136_123_179},
+    "183.6.90.205": {"type": "ftp", "config": ftp_219_136_123_179},
     "ftp://192.168.50.12/mnt/NAS/mcn/cache": {"type": "ftp", "config": ftp_192_168_50_12},
-    "ftp://183.6.90.205/mnt/NAS/mcn/cache": {"type": "ftp", "config": ftp_183_6_90_205},
-    "ftp://219.136.123.179/mnt/NAS/mcn/cache": {"type": "ftp", "config": ftp_183_6_90_205},
+    "ftp://183.6.90.205/mnt/NAS/mcn/cache": {"type": "ftp", "config": ftp_219_136_123_179},
+    "ftp://219.136.123.179/mnt/NAS/mcn/cache": {"type": "ftp", "config": ftp_219_136_123_179},
     "res.zjtemplate.com": {"type": "oss", "config": oss_res_config},
     "upload.zjtemplate.com": {"type": "oss", "config": oss_upload_config},
     "oss.zjtemplate.com": {"type": "oss", "config": oss_template_config},
@@ -360,16 +344,21 @@ DOMAIN_CONFIG = {
 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",
 }
 
 SUBDOMAIN = {
+    "183.6.90.205": [
+        ftp_192_168_50_12,
+        ftp_219_136_123_179,
+    ],
     "219.136.123.179": [
         ftp_192_168_50_12,
-        ftp_183_6_90_205,
+        ftp_219_136_123_179,
     ],
-    "192.168.50.138": [
+    "192.168.50.12": [
         ftp_192_168_50_12,
-        ftp_183_6_90_205,
+        ftp_219_136_123_179,
     ]
 }
 
@@ -688,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.2 → ryry_cli-5.4/ryry_cli.egg-info}/PKG-INFO

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

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

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