ryry-cli 3.0__tar.gz → 3.2__tar.gz

{ryry_cli-3.0 → ryry_cli-3.2}/PKG-INFO

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

{ryry_cli-3.0 → ryry_cli-3.2}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="3.0"
-app_bulld_anchor="Noh_2025-05-16 16:51:25.132313"
+app_version="3.2"
+app_bulld_anchor="Noh_2025-05-27 17:13:14.294129"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-3.0 → ryry_cli-3.2}/ryry/ryry_webapi.py

@@ -2,6 +2,7 @@ import json, os, datetime
 import uuid, requests, calendar, time
 from requests.adapters import HTTPAdapter
 from urllib3.util.retry import Retry
+from urllib.parse import urlparse, urlunparse
 
 from ryry import store, utils, taskUtils, constant, task
 
@@ -255,6 +256,22 @@ def _upload(localFilePath, ext, keep_it_always=False):
         raise Exception(f"upload fail!, reason={r2}")
     return r3
 
+def _changeDomain(url, fix_domain):
+    parsed_url = urlparse(url)
+    return urlunparse(parsed_url._replace(netloc=fix_domain))
+    # netloc = parsed_url.netloc
+    # if 'meco-web-hk-beta.oss-cn-hongkong.aliyuncs.com' in netloc:
+    #     mecord_netloc = 'oss.zjtemplate.com'
+    # elif 'meco-web-sg.oss-accelerate.aliyuncs.com' in netloc:
+    #     mecord_netloc = 'oss.zjtemplate.com'
+    # elif 'p-template-hk.oss-cn-hongkong.aliyuncs.com' in netloc:
+    #     mecord_netloc = 'oss.zjtemplate.com'
+    # elif 'p-upload-gz.oss-cn-guangzhou.aliyuncs.com' in netloc:
+    #     mecord_netloc = 'upload.zjtemplate.com'
+    # elif 'mecord' in netloc:
+    #     mecord_netloc = 'm.mecordai.com'
+    # mecord_url = parsed_url._replace(netloc=fix_domain)
+    
 def upload(localFilePath, ext, keep_it_always=False):
     try:
         return _upload(localFilePath, ext, keep_it_always)
@@ -262,33 +279,35 @@ def upload(localFilePath, ext, keep_it_always=False):
         pass
     from mecord import upload as mecord_upload
     try:
-        return mecord_upload.upload(localFilePath, None, "sg")
+        url = mecord_upload.upload(localFilePath, None, "sg")
+        return _changeDomain(url, "m.mecordai.com")
     except:
         pass
     try:
-        return mecord_upload.upload(localFilePath, None, "test")
+        url = mecord_upload.upload(localFilePath, None, "test")
+        return _changeDomain(url, "m-beta.mecordai.com")
     except:
         pass
-    try:
+    def upload_oss(localFilePath, ext, bucket, endpoint):
         import hashlib
         import hmac
         import base64
-        timestamp = datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S GMT")        
+        timestamp = datetime.datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S GMT")        
         content_type = "application/octet-stream"
         
         random_name = ''.join(str(uuid.uuid4()).split('-'))
+        if ext[0:1] == ".":
+            ext = ext[1:]
         object_key = f"temp/{random_name}.{ext}"
-        bucket = "p-template-hk"
         resource = f"/{bucket}/{object_key}"
-        endpoint = "oss-cn-hongkong.aliyuncs.com"        
         string_to_sign = f"PUT\n\n{content_type}\n{timestamp}\n{resource}"    
         signature = base64.b64encode(
-            hmac.new("sZDIL9uhqTgeQOkAjpbSOFm0259fwZ".encode('utf-8'), string_to_sign.encode('utf-8'), hashlib.sha1).digest()
+            hmac.new("2UtzA9cHnfNdZOtxLVuhM8SOz5HEdv".encode('utf-8'), string_to_sign.encode('utf-8'), hashlib.sha1).digest()
         ).decode('utf-8')        
         url = f"https://{bucket}.{endpoint}/{object_key}"
         headers = {
             "Date": timestamp,
-            "Authorization": f"OSS LTAI5t6YZQo4MZV6LWwt4Rnj:{signature}",
+            "Authorization": f"OSS LTAI5tLseFAXY33JA7zWDf4o:{signature}",
             "Content-Type": content_type
         }
         with open(localFilePath, "rb") as file:
@@ -296,6 +315,14 @@ def upload(localFilePath, ext, keep_it_always=False):
         response = requests.put(url, data=file_data, headers=headers)
         if response.status_code == 200:
             return url
+    try:
+        url = upload_oss(localFilePath, ext, "p-template-hk", "oss-cn-hongkong.aliyuncs.com")
+        return _changeDomain(url, "oss.zjtemplate.com")
+    except:
+        pass
+    try:
+        url = upload_oss(localFilePath, ext, "p-upload-gz", "oss-cn-guangzhou.aliyuncs.com")
+        return _changeDomain(url, "upload.zjtemplate.com")
     except:
         pass
     raise Exception("all upload target is fail!")
@@ -391,7 +418,7 @@ def checkTask(checkUUID):
                 result_data = json.load(f)
             finish = result_data["finish"]
             success = result_data["success"]
-            data = result_data["data"]
+            data = json.loads(result_data["data"])
             progress = result_data["progress"]
             return finish, success, data, progress
         else:

{ryry_cli-3.0 → ryry_cli-3.2}/ryry/upload.py

@@ -43,7 +43,7 @@ def additionalUrl(srcFile, ossUrl):
     except:
         return ossUrl
 
-def upload(src, taskUUID=None, timeout=300, needTranscode=True, keep_it_always=False):
+def upload(src, taskUUID=None, needTranscode=True, keep_it_always=False):
     import os
     from pathlib import Path
     from ryry import taskUtils

{ryry_cli-3.0 → ryry_cli-3.2}/ryry_cli.egg-info/PKG-INFO

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

{ryry_cli-3.0 → ryry_cli-3.2}/setup.py

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