ryry-cli 4.5__tar.gz → 4.7__tar.gz

{ryry_cli-4.5/ryry_cli.egg-info → ryry_cli-4.7}/PKG-INFO

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

{ryry_cli-4.5 → ryry_cli-4.7}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="4.5"
-app_bulld_anchor="Noh_2025-07-18 15:37:11.722431"
+app_version="4.7"
+app_bulld_anchor="Noh_2025-07-18 17:12:50.099501"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-4.5 → ryry_cli-4.7}/ryry/server_func.py

@@ -77,7 +77,7 @@ class Task:
         
         realTaskUUID = fromUUID
         if realTaskUUID == None or len(realTaskUUID) <= 0:
-            realTaskUUID = taskUtils.taskInfoWithFirstTask()
+            realTaskUUID, _ = taskUtils.taskInfoWithFirstTask()
             
         mayby_domain = ""
         if "domain" not in multi_params[0]:
@@ -117,7 +117,7 @@ class AsyncTask:
         
         realTaskUUID = fromUUID
         if realTaskUUID == None or len(realTaskUUID) <= 0:
-            realTaskUUID = taskUtils.taskInfoWithFirstTask()
+            realTaskUUID, _ = taskUtils.taskInfoWithFirstTask()
             
         self.params["fromUUID"] = realTaskUUID
         if "domain" not in self.params:

{ryry_cli-4.5 → ryry_cli-4.7}/ryry/task.py

@@ -249,7 +249,7 @@ def executeLocalPython(taskUUID, cmd, param, timeout=3600):
 def updateProgress(data, progress=50, taskUUID=None):
     realTaskUUID = taskUUID
     if realTaskUUID == None or len(realTaskUUID) <= 0:
-        realTaskUUID = taskUtils.taskInfoWithFirstTask()
+        realTaskUUID, _ = taskUtils.taskInfoWithFirstTask()
         
     if progress < 0:
         progress = 0

{ryry_cli-4.5 → ryry_cli-4.7}/ryry/taskUtils.py

@@ -18,15 +18,15 @@ def taskInfoWithFirstTask():
             data = json.load(f)
         for it in data:
             if it not in ["last_task_pts"]:
-                return it
-    return None
-def taskDomainWithUUID(taskUUID):
+                return it, data[it]
+    return None, None
+def taskInfoWithUUID(taskUUID):
     if os.path.exists(task_config_file):
         with open(task_config_file, 'r', encoding='utf-8') as f:
             task_config = json.load(f)
         if taskUUID in task_config:
-            return task_config[taskUUID]["domain"]
-    return ""
+            return task_config[taskUUID]
+    return None
     
 WECHAT_URL = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=1b006560-7012-4bf0-8c5e-a23830bc0a0b"
 def uploadFile2Wechat(filepath):

{ryry_cli-4.5 → ryry_cli-4.7}/ryry/upload.py

@@ -49,17 +49,26 @@ def upload(src, taskUUID=None, needTranscode=True, keepItAlways=False, additiona
     from ryry import taskUtils as ryry_taskUtils
     if os.path.exists(src) == False:
         raise Exception(f"upload file not found")
+    targetDomain = None
     if taskUUID == None or len(taskUUID) <= 0:
-        taskUUID = ryry_taskUtils.taskInfoWithFirstTask()
-        targetDomain = ryry_taskUtils.taskDomainWithUUID(taskUUID)
+        taskUUID, taskInfo = ryry_taskUtils.taskInfoWithFirstTask()
+        if taskInfo:
+            targetDomain = taskInfo["domain"]
     else:
-        targetDomain = ryry_taskUtils.taskDomainWithUUID(taskUUID)
+        taskInfo = ryry_taskUtils.taskInfoWithUUID(taskUUID)
+        targetDomain = taskInfo.get("domain", None)
         if targetDomain == None or len(targetDomain) <= 0:
             from mecord import taskUtils as mecord_taskUtils
             uuid_has_country_info = mecord_taskUtils.taskCountryWithUUID(taskUUID)
             if uuid_has_country_info:
                 #这里不区分meco还是mecord，请求meco/mecord后端接口时，根据本地状态来向不同服务器请求
                 targetDomain = "https://m.mecoai.cn/"
+    
+    if (targetDomain == None or len(targetDomain) <= 0) and (uploadPath and len(uploadPath) > 0):
+        #找不到domain，但是有uploadPath的情况下，应该是ftp配置，这里做修正
+        if '/mnt/NAS/mcn/' not in uploadPath:
+            uploadPath = os.path.join('/mnt/NAS/mcn/', uploadPath)
+        
 
     if needTranscode:
         needDeleteSrc, newSrc = transcode(src)
@@ -101,6 +110,10 @@ def uploadByDomain(src, targetDomain, taskUUID, keepItAlways=False, uploadPath=N
     if ftp_config:
         return ftpUpload(src, f"{new_file_name}.{ext}", ftp_config, upload_path)
     
+    if "mnt/NAS/mcn" in upload_path:
+        ftp_config = getFtpConfig("183.6.90.205")
+        return ftpUpload(src, f"{new_file_name}.{ext}", ftp_config, upload_path)
+    
     from ryry import ryry_webapi
     return ryry_webapi.upload(src, ext, keepItAlways)
 
@@ -192,6 +205,8 @@ def ftpUpload(file, new_file_name, subdomain, upload_path=""):
     ftp.login(username, password)  
 
     if upload_path:
+        if upload_path[0:1] == "/":
+            upload_path = upload_path[1:]
         s = deepFtpUpload(file, new_file_name, ftp, upload_path, f'ftp://{ip}/{upload_path}')
     else:
         s = deepFtpUpload(file, new_file_name, ftp, writepath, readpath)

{ryry_cli-4.5 → ryry_cli-4.7/ryry_cli.egg-info}/PKG-INFO

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

{ryry_cli-4.5 → ryry_cli-4.7}/setup.py

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