ryry-cli 4.29__tar.gz → 4.31__tar.gz

{ryry_cli-4.29/ryry_cli.egg-info → ryry_cli-4.31}/PKG-INFO

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

{ryry_cli-4.29 → ryry_cli-4.31}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="4.29"
-app_bulld_anchor="Noh_2025-07-29 16:28:48.477084"
+app_version="4.31"
+app_bulld_anchor="Noh_2025-07-30 20:11:30.483060"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-4.29 → ryry_cli-4.31}/ryry/ryry_webapi.py

@@ -282,14 +282,18 @@ def _changeDomain(url, fix_domain):
     #     mecord_netloc = 'm.mecordai.com'
     # mecord_url = parsed_url._replace(netloc=fix_domain)
     
-def upload(localFilePath, ext, keepItAlways=False):
+def upload(localFilePath, ext, keepItAlways=False, needTranscode=False, additionalUrl=False):
     try:
         return _upload(localFilePath, ext, keepItAlways=False)
     except:
         pass
     from mecord import upload as mecord_upload
     try:
-        url = mecord_upload.upload(localFilePath, None, "sg")
+        url = mecord_upload.upload(localFilePath,
+                                   None, 
+                                   "sg",
+                                   needTranscode=needTranscode,
+                                   needAddtionUrl=True) #mecord会使用签名信息，强制needAddtionUrl
         return _changeDomain(url, "m.mecordai.com")
     except:
         pass

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

{ryry_cli-4.29 → ryry_cli-4.31}/ryry/upload.py

@@ -73,7 +73,11 @@ def upload(src, taskUUID=None, needTranscode=False, keepItAlways=False, addition
         newSrc = src
     
     # 根据targetDomain判断使用不同的上传逻辑
-    ossurl = uploadByDomain(newSrc, targetDomain, taskUUID, keepItAlways=keepItAlways, uploadPath=uploadPath)
+    ossurl = uploadByDomain(newSrc, targetDomain, taskUUID, 
+                            keepItAlways=keepItAlways, 
+                            uploadPath=uploadPath,
+                            needTranscode=needTranscode,
+                            additionalUrl=additionalUrl)
         
     if additionalUrl:
         ossurl = additionalUrl(newSrc, ossurl)
@@ -81,7 +85,7 @@ def upload(src, taskUUID=None, needTranscode=False, keepItAlways=False, addition
         os.remove(newSrc)
     return ossurl
 
-def uploadByDomain(src, targetDomain, taskUUID, keepItAlways=False, uploadPath=None):
+def uploadByDomain(src, targetDomain, taskUUID, keepItAlways=False, uploadPath=None, needTranscode=False, additionalUrl=False):
     import os
     from pathlib import Path
     import uuid
@@ -95,7 +99,9 @@ def uploadByDomain(src, targetDomain, taskUUID, keepItAlways=False, uploadPath=N
         upload_path = uploadPath
     if isMecordConfig(parsed_domain):
         from mecord import upload as mecord_upload
-        return mecord_upload.upload(src, taskUUID)
+        return mecord_upload.upload(src, taskUUID, 
+                                    needTranscode=needTranscode, 
+                                    needAddtionUrl=True) #mecord会使用签名信息，强制needAddtionUrl
     
     oss_config = getOssConfig(parsed_domain)
     if oss_config:
@@ -119,7 +125,10 @@ def uploadByDomain(src, targetDomain, taskUUID, keepItAlways=False, uploadPath=N
             return ftpUpload(src, file_name, ftp_config, upload_path)
        
     from ryry import ryry_webapi
-    return ryry_webapi.upload(src, ext, keepItAlways)
+    return ryry_webapi.upload(src, ext, 
+                              keepItAlways=keepItAlways, 
+                              needTranscode=needTranscode, 
+                              additionalUrl=additionalUrl)
 
 def parseDomainAndPath(targetDomain):
     from urllib.parse import urlparse

{ryry_cli-4.29 → ryry_cli-4.31}/ryry/utils.py

@@ -231,8 +231,8 @@ def begin_restart(reason, update_cli=False, simple="https://pypi.python.org/simp
             "simple": simple
         },f)
     
-K1 = "TFRBSTV0THNlRkFYWTMzSkE3eldEZjRv"
-K2 = "MlV0ekE5Y0huZk5kWk90eExWdWhNOFNPejVIRWR2"
+K1 = "TFRBSTV0UkR3NXhocHc1eDlVdkZaUWsy"
+K2 = "TFVuYlRuZFRQMHpxYmU3TjVJSGw0YlVvdlJNQkR6"
 def _decode_key(encoded_key):
     import base64
     try:
@@ -244,6 +244,25 @@ def _decode_key(encoded_key):
         decoded_bytes = base64.b64decode(encoded_key.encode('utf-8'))
         return decoded_bytes.hex()
 
+def _encode_key(raw_input):
+    import base64
+    if isinstance(raw_input, bytes):
+        # 直接是字节数据，编码为 base64
+        encoded = base64.b64encode(raw_input)
+    elif isinstance(raw_input, str):
+        try:
+            # 尝试当作普通字符串
+            encoded = base64.b64encode(raw_input.encode('utf-8'))
+        except UnicodeEncodeError:
+            # 如果编码失败，尝试当作十六进制字符串
+            try:
+                encoded = base64.b64encode(bytes.fromhex(raw_input))
+            except ValueError:
+                raise ValueError("Input is not valid UTF-8 string or hex string")
+    else:
+        raise TypeError("Input must be str or bytes")
+    return encoded.decode('utf-8')
+
 
 def check_restart():
     restart_file = os.path.join(constant.base_path, "restart")

{ryry_cli-4.29 → ryry_cli-4.31/ryry_cli.egg-info}/PKG-INFO

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

{ryry_cli-4.29 → ryry_cli-4.31}/setup.py

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