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

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

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

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

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

{ryry_cli-4.7 → ryry_cli-4.9}/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, uploadPath=None):
+def upload(src, taskUUID=None, needTranscode=False, keepItAlways=False, additionalUrl=False, uploadPath=None):
     import os
     from pathlib import Path
     from ryry import taskUtils as ryry_taskUtils
@@ -53,10 +53,11 @@ def upload(src, taskUUID=None, needTranscode=True, keepItAlways=False, additiona
     if taskUUID == None or len(taskUUID) <= 0:
         taskUUID, taskInfo = ryry_taskUtils.taskInfoWithFirstTask()
         if taskInfo:
-            targetDomain = taskInfo["domain"]
+            targetDomain = taskInfo.get("domain", None)
     else:
         taskInfo = ryry_taskUtils.taskInfoWithUUID(taskUUID)
-        targetDomain = taskInfo.get("domain", None)
+        if taskInfo:
+            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)
@@ -92,8 +93,6 @@ def uploadByDomain(src, targetDomain, taskUUID, keepItAlways=False, uploadPath=N
     from urllib.parse import urlparse
     
     file_name = Path(src).name
-    ext = os.path.splitext(file_name)[-1][1:]
-    new_file_name = ''.join(str(uuid.uuid4()).split('-'))
     
     parsed_domain, upload_path = parseDomainAndPath(targetDomain)
     if uploadPath:
@@ -104,15 +103,17 @@ def uploadByDomain(src, targetDomain, taskUUID, keepItAlways=False, uploadPath=N
     
     oss_config = getOssConfig(parsed_domain)
     if oss_config:
+        ext = os.path.splitext(file_name)[-1][1:]
+        new_file_name = ''.join(str(uuid.uuid4()).split('-'))
         return uploadToOss(src, f"{new_file_name}.{ext}", oss_config, upload_path)
     
     ftp_config = getFtpConfig(parsed_domain)
     if ftp_config:
-        return ftpUpload(src, f"{new_file_name}.{ext}", ftp_config, upload_path)
+        return ftpUpload(src, file_name, 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)
+        return ftpUpload(src, file_name, ftp_config, upload_path)
     
     from ryry import ryry_webapi
     return ryry_webapi.upload(src, ext, keepItAlways)

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

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

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

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