ryry-cli 4.4__tar.gz → 4.6__tar.gz

{ryry_cli-4.4/ryry_cli.egg-info → ryry_cli-4.6}/PKG-INFO

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

{ryry_cli-4.4 → ryry_cli-4.6}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="4.4"
-app_bulld_anchor="Noh_2025-07-18 15:18:12.819574"
+app_version="4.6"
+app_bulld_anchor="Noh_2025-07-18 16:44:49.443230"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-4.4 → ryry_cli-4.6}/ryry/upload.py

@@ -43,7 +43,7 @@ def additionalUrl(srcFile, ossUrl):
     except:
         return ossUrl
 
-def upload(src, taskUUID=None, needTranscode=True, keepItAlways=False, additionalUrl=False):
+def upload(src, taskUUID=None, needTranscode=True, keepItAlways=False, additionalUrl=False, uploadPath=None):
     import os
     from pathlib import Path
     from ryry import taskUtils as ryry_taskUtils
@@ -56,7 +56,10 @@ def upload(src, taskUUID=None, needTranscode=True, keepItAlways=False, additiona
         targetDomain = ryry_taskUtils.taskDomainWithUUID(taskUUID)
         if targetDomain == None or len(targetDomain) <= 0:
             from mecord import taskUtils as mecord_taskUtils
-            targetDomain = mecord_taskUtils.taskDomainWithUUID(taskUUID)
+            uuid_has_country_info = mecord_taskUtils.taskCountryWithUUID(taskUUID)
+            if uuid_has_country_info:
+                #这里不区分meco还是mecord，请求meco/mecord后端接口时，根据本地状态来向不同服务器请求
+                targetDomain = "https://m.mecoai.cn/"
 
     if needTranscode:
         needDeleteSrc, newSrc = transcode(src)
@@ -65,7 +68,7 @@ def upload(src, taskUUID=None, needTranscode=True, keepItAlways=False, additiona
         newSrc = src
     
     # 根据targetDomain判断使用不同的上传逻辑
-    ossurl = uploadByDomain(newSrc, targetDomain, taskUUID, keepItAlways)
+    ossurl = uploadByDomain(newSrc, targetDomain, taskUUID, keepItAlways=keepItAlways, uploadPath=uploadPath)
         
     if additionalUrl:
         ossurl = additionalUrl(newSrc, ossurl)
@@ -73,7 +76,7 @@ def upload(src, taskUUID=None, needTranscode=True, keepItAlways=False, additiona
         os.remove(newSrc)
     return ossurl
 
-def uploadByDomain(src, targetDomain, taskUUID, keepItAlways=False):
+def uploadByDomain(src, targetDomain, taskUUID, keepItAlways=False, uploadPath=None):
     import os
     from pathlib import Path
     import uuid
@@ -84,6 +87,8 @@ def uploadByDomain(src, targetDomain, taskUUID, keepItAlways=False):
     new_file_name = ''.join(str(uuid.uuid4()).split('-'))
     
     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)
@@ -96,6 +101,10 @@ def uploadByDomain(src, targetDomain, taskUUID, keepItAlways=False):
     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)
 
@@ -187,6 +196,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.4 → ryry_cli-4.6/ryry_cli.egg-info}/PKG-INFO

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

{ryry_cli-4.4 → ryry_cli-4.6}/setup.py

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