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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 4.3
+Version: 4.5
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen
@@ -23,6 +23,7 @@ Requires-Dist: gputil
 Requires-Dist: urlparser
 Requires-Dist: urllib3
 Requires-Dist: portalocker
+Requires-Dist: mecord-cli>=0.7.405
 
 ryry Python Tool
 ===============================================

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

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

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

@@ -43,15 +43,23 @@ 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
+    from ryry import taskUtils as ryry_taskUtils
     if os.path.exists(src) == False:
         raise Exception(f"upload file not found")
     if taskUUID == None or len(taskUUID) <= 0:
-        taskUUID = taskUtils.taskInfoWithFirstTask()
-    targetDomain = taskUtils.taskDomainWithUUID(taskUUID)
+        taskUUID = ryry_taskUtils.taskInfoWithFirstTask()
+        targetDomain = ryry_taskUtils.taskDomainWithUUID(taskUUID)
+    else:
+        targetDomain = ryry_taskUtils.taskDomainWithUUID(taskUUID)
+        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 needTranscode:
         needDeleteSrc, newSrc = transcode(src)
@@ -60,7 +68,7 @@ def upload(src, taskUUID=None, needTranscode=True, keepItAlways=False, additiona
         newSrc = src
     
     # 根据targetDomain判断使用不同的上传逻辑
-    ossurl = uploadByDomain(newSrc, targetDomain, keepItAlways)
+    ossurl = uploadByDomain(newSrc, targetDomain, taskUUID, keepItAlways=keepItAlways, uploadPath=uploadPath)
         
     if additionalUrl:
         ossurl = additionalUrl(newSrc, ossurl)
@@ -68,7 +76,7 @@ def upload(src, taskUUID=None, needTranscode=True, keepItAlways=False, additiona
         os.remove(newSrc)
     return ossurl
 
-def uploadByDomain(src, targetDomain, keepItAlways=False):
+def uploadByDomain(src, targetDomain, taskUUID, keepItAlways=False, uploadPath=None):
     import os
     from pathlib import Path
     import uuid
@@ -79,6 +87,12 @@ def uploadByDomain(src, targetDomain, 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)
+    
     oss_config = getOssConfig(parsed_domain)
     if oss_config:
         return uploadToOss(src, f"{new_file_name}.{ext}", oss_config, upload_path)
@@ -239,6 +253,24 @@ oss_template_config = {
     "domain": "https://oss.zjtemplate.com"
 }
 
+def match_wildcard_domain(target_domain, pattern):
+    if pattern.startswith("*."):
+        suffix = pattern[1:]  # 去掉 "*." 前缀
+        return target_domain.endswith(suffix)
+    return target_domain == pattern
+
+def get_domain_config(target_domain):
+    # 首先尝试精确匹配
+    if target_domain in DOMAIN_CONFIG:
+        return DOMAIN_CONFIG[target_domain]
+    
+    # 然后尝试通配符匹配
+    for pattern, config in DOMAIN_CONFIG.items():
+        if match_wildcard_domain(target_domain, pattern):
+            return config
+    
+    return None
+
 DOMAIN_CONFIG = {
     "192.168.50.12": {"type": "ftp", "config": ftp_192_168_50_12},
     "183.6.90.205": {"type": "ftp", "config": ftp_183_6_90_205},
@@ -247,6 +279,8 @@ DOMAIN_CONFIG = {
     "res.zjtemplate.com": {"type": "oss", "config": oss_res_config},
     "upload.zjtemplate.com": {"type": "oss", "config": oss_upload_config},
     "oss.zjtemplate.com": {"type": "oss", "config": oss_template_config},
+    "*.mecoai.cn": {"type": "mecord-cli", "config": {}},
+    "*.mecordai.com": {"type": "mecord-cli", "config": {}},
 }
 
 SUBDOMAIN = {
@@ -261,13 +295,21 @@ SUBDOMAIN = {
 }
 
 def getOssConfig(targetDomain):
-    if targetDomain in DOMAIN_CONFIG and DOMAIN_CONFIG[targetDomain]["type"] == "oss":
-        return DOMAIN_CONFIG[targetDomain]["config"]
+    config = get_domain_config(targetDomain)
+    if config and config["type"] == "oss":
+        return config["config"]
     return None
 
+def isMecordConfig(targetDomain):
+    config = get_domain_config(targetDomain)
+    if config and config["type"] == "mecord-cli":
+        return True
+    return False
+
 def getFtpConfig(targetDomain):
-    if targetDomain in DOMAIN_CONFIG and DOMAIN_CONFIG[targetDomain]["type"] == "ftp":
-        return DOMAIN_CONFIG[targetDomain]["config"]
+    config = get_domain_config(targetDomain)
+    if config and config["type"] == "ftp":
+        return config["config"]
     return None
 
 def getSubdomain(targetDomain):
@@ -300,6 +342,14 @@ def getFirstSupportSubdomain():
         for domain, config in DOMAIN_CONFIG.items():
             if config["type"] == "oss":
                 return {"type": "oss", "config": config["config"], "domain": config["config"]["domain"]}
+            if config["type"] == "mecord-cli":
+                # 对于通配符域名，返回一个示例域名
+                if domain.startswith("*."):
+                    # 将 *.mecoai.cn 转换为 example.mecoai.cn
+                    example_domain = "example" + domain[1:]
+                    return {"type": "mecord-cli", "config": {}, "domain": example_domain}
+                else:
+                    return {"type": "mecord-cli", "config": {}, "domain": domain}
             elif config["type"] == "ftp":
                 ftp_config = config["config"]
                 if _can_connect_ftp(ftp_config["host"], ftp_config["port"], ftp_config["username"], ftp_config["password"], ftp_config["writepath"]):

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 4.3
+Version: 4.5
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen
@@ -23,6 +23,7 @@ Requires-Dist: gputil
 Requires-Dist: urlparser
 Requires-Dist: urllib3
 Requires-Dist: portalocker
+Requires-Dist: mecord-cli>=0.7.405
 
 ryry Python Tool
 ===============================================

{ryry_cli-4.3 → ryry_cli-4.5}/ryry_cli.egg-info/requires.txt

@@ -10,3 +10,4 @@ gputil
 urlparser
 urllib3
 portalocker
+mecord-cli>=0.7.405

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

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "4.3"
+ryry_version = "4.5"
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")
 try:
@@ -70,6 +70,7 @@ setuptools.setup(
         'urlparser',
         'urllib3',
         'portalocker',
+        'mecord-cli>=0.7.405',
     ],
     dependency_links=[],
     entry_points={