ryry-cli 4.19__tar.gz → 4.21__tar.gz

{ryry_cli-4.19/ryry_cli.egg-info → ryry_cli-4.21}/PKG-INFO

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

{ryry_cli-4.19 → ryry_cli-4.21}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="4.19"
-app_bulld_anchor="Noh_2025-07-23 18:25:48.042147"
+app_version="4.21"
+app_bulld_anchor="Noh_2025-07-23 23:57:33.731230"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-4.19 → ryry_cli-4.21}/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 4.19":
+            elif read_data["extend"].get("app", "") == "ryry-cli 4.21":
                 _genExtend()
         else:
             _genExtend()

{ryry_cli-4.19 → ryry_cli-4.21}/ryry/upload.py

@@ -106,13 +106,17 @@ def uploadByDomain(src, targetDomain, taskUUID, keepItAlways=False, uploadPath=N
     if ftp_config:
         return ftpUpload(src, file_name, ftp_config, upload_path)
     
-    if "mnt/NAS/mcn" in upload_path or "aigc_output/" in targetDomain:
-        ftp_config = getFtpConfig("183.6.90.205")
-        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("183.6.90.205")
-        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("183.6.90.205")
+            return ftpUpload(src, file_name, ftp_config, upload_path)
+        elif (targetDomain != None and"aigc_output/" in targetDomain):
+            ftp_config = getFtpConfig("183.6.90.205")
+            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("183.6.90.205")
+            return ftpUpload(src, file_name, ftp_config, upload_path)
        
     from ryry import ryry_webapi
     return ryry_webapi.upload(src, ext, keepItAlways)

{ryry_cli-4.19 → ryry_cli-4.21/ryry_cli.egg-info}/PKG-INFO

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

{ryry_cli-4.19 → ryry_cli-4.21}/setup.py

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