ryry-cli 6.15__tar.gz → 6.16__tar.gz

{ryry_cli-6.15/ryry_cli.egg-info → ryry_cli-6.16}/PKG-INFO

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

{ryry_cli-6.15 → ryry_cli-6.16}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="6.15"
-app_bulld_anchor="Noh_2026-06-11 16:43:21.586045"
+app_version="6.16"
+app_bulld_anchor="Noh_2026-06-11 16:51:17.054964"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-6.15 → ryry_cli-6.16}/ryry/store.py

@@ -177,7 +177,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 6.15":
+            elif read_data["extend"].get("app", "") == "ryry-cli 6.16":
                 _genExtend()
             elif any(k not in read_data["extend"] for k in ["device_id", "host_name", "cpu", "memory", "disk", "gpu"]):
                 _genExtend()

{ryry_cli-6.15 → ryry_cli-6.16}/ryry/upload.py

@@ -44,7 +44,7 @@ def additionalUrl(srcFile, ossUrl):
     except:
         return ossUrl
 
-def upload(src, taskUUID=None, needTranscode=False, keepItAlways=False, additionalUrl=False, uploadPath=None):
+def upload(src, taskUUID=None, needTranscode=False, keepItAlways=False, additionalUrl=False):
     import os
     from pathlib import Path
     from ryry import taskUtils as ryry_taskUtils
@@ -74,8 +74,7 @@ def upload(src, taskUUID=None, needTranscode=False, keepItAlways=False, addition
     
     # 根据targetDomain判断使用不同的上传逻辑
     ossurl = uploadByDomain(newSrc, targetDomain, taskUUID, 
-                            keepItAlways=keepItAlways, 
-                            uploadPath=uploadPath,
+                            keepItAlways=keepItAlways,
                             needTranscode=needTranscode,
                             additionalUrl=additionalUrl)
         
@@ -85,7 +84,9 @@ def upload(src, taskUUID=None, needTranscode=False, keepItAlways=False, addition
         os.remove(newSrc)
     return ossurl
 
-def uploadByDomain(src, targetDomain, taskUUID, keepItAlways=False, uploadPath=None, needTranscode=False, additionalUrl=False):
+def uploadByDomain(src, targetDomain, 
+                   taskUUID, keepItAlways=False, 
+                   needTranscode=False, additionalUrl=False):
     import os
     from pathlib import Path
     import uuid
@@ -95,8 +96,6 @@ def uploadByDomain(src, targetDomain, taskUUID, keepItAlways=False, uploadPath=N
     ext = os.path.splitext(file_name)[-1][1:]
     
     parsed_domain, upload_path = parseDomainAndPath(targetDomain)
-    if uploadPath:
-        upload_path = uploadPath
     if isMecordConfig(parsed_domain):
         from mecord import upload as mecord_upload
         return mecord_upload.upload(src, taskUUID, 
@@ -114,18 +113,6 @@ def uploadByDomain(src, targetDomain, taskUUID, keepItAlways=False, uploadPath=N
     ftp_config = getFtpConfig(parsed_domain)
     if ftp_config:
         return ftpUpload(src, file_name, ftp_config, upload_path)
-    
-    if upload_path:
-        if "mnt/NAS/mcn" in upload_path or "aigc_output/" in upload_path:
-            ftp_config = getFtpConfig("219.136.123.179")
-            return ftpUpload(src, file_name, ftp_config, upload_path)
-        elif (targetDomain != None and"aigc_output/" in targetDomain):
-            ftp_config = getFtpConfig("219.136.123.179")
-            return ftpUpload(src, file_name, ftp_config, upload_path)
-        elif (targetDomain == None or len(targetDomain) <= 0) and (uploadPath and len(uploadPath) > 0):
-            #找不到domain，但是有uploadPath的情况下，默认走ftp
-            ftp_config = getFtpConfig("219.136.123.179")
-            return ftpUpload(src, file_name, ftp_config, upload_path)
        
     from ryry import ryry_webapi
     return ryry_webapi.upload(src, ext, 

{ryry_cli-6.15 → ryry_cli-6.16/ryry_cli.egg-info}/PKG-INFO

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

{ryry_cli-6.15 → ryry_cli-6.16}/setup.py

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