ryry-cli 4.30__tar.gz → 5.0__tar.gz

{ryry_cli-4.30/ryry_cli.egg-info → ryry_cli-5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 4.30
+Version: 5.0
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen
@@ -25,7 +25,7 @@ Requires-Dist: urllib3
 Requires-Dist: portalocker
 Requires-Dist: PyYAML
 Provides-Extra: with-mecord
-Requires-Dist: mecord-cli>=0.7.405; extra == "with-mecord"
+Requires-Dist: mecord-cli>=0.7.407; extra == "with-mecord"
 
 ryry Python Tool
 ===============================================

{ryry_cli-4.30 → ryry_cli-5.0}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="4.30"
-app_bulld_anchor="Noh_2025-07-30 14:00:12.143574"
+app_version="5.0"
+app_bulld_anchor="Noh_2025-09-28 18:13:16.968478"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-4.30 → ryry_cli-5.0}/ryry/main.py

@@ -207,8 +207,8 @@ def status():
         service_status(None, 0)
         print(scr_line("-" * ll*3))
         device_status(None, 0)
-        print(scr_line("-" * ll*3))
-        proxy_status(None, 0)
+        # print(scr_line("-" * ll*3))
+        # proxy_status(None, 0)
         print(scr_line("-" * ll*3))
         widget_status(None, 0)
         print(scr_line("-" * ll*3))

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

{ryry_cli-4.30 → ryry_cli-5.0}/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:
@@ -108,18 +114,21 @@ def uploadByDomain(src, targetDomain, taskUUID, keepItAlways=False, uploadPath=N
     
     if upload_path:
         if "mnt/NAS/mcn" in upload_path or "aigc_output/" in upload_path:
-            ftp_config = getFtpConfig("183.6.90.205")
+            ftp_config = getFtpConfig("219.136.123.179")
             return ftpUpload(src, file_name, ftp_config, upload_path)
         elif (targetDomain != None and"aigc_output/" in targetDomain):
-            ftp_config = getFtpConfig("183.6.90.205")
+            ftp_config = getFtpConfig("219.136.123.179")
             return ftpUpload(src, file_name, ftp_config, upload_path)
         elif (targetDomain == None or len(targetDomain) <= 0) and (uploadPath and len(uploadPath) > 0):
             #找不到domain，但是有uploadPath的情况下，默认走ftp
-            ftp_config = getFtpConfig("183.6.90.205")
+            ftp_config = getFtpConfig("219.136.123.179")
             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
@@ -206,6 +215,22 @@ def ftpUpload(file, new_file_name, subdomain, upload_path=""):
     import ftplib
     while retry < 3:
         try:
+            #如果ip是外网ip，并且在FTP_REPLACEMENT内有，则先替换成内网ip上传一次
+            if retry == 0 and "192.168" not in ip and ip in FTP_REPLACEMENT:
+                try:
+                    local_network_config = DOMAIN_CONFIG[FTP_REPLACEMENT[ip]]["config"]
+                    ftp = ftplib.FTP()
+                    ftp.connect(local_network_config["host"], local_network_config["port"], timeout=5)
+                    ftp.login(local_network_config["username"], local_network_config["password"])  
+                    if upload_path:
+                        s = deepFtpUpload(file, new_file_name, ftp, upload_path, readpath)
+                    else:
+                        s = deepFtpUpload(file, new_file_name, ftp, writepath, readpath)
+                    ftp.quit()
+                    return s
+                except:
+                    pass
+            
             if retry > 0:
                 has_bak = FTP_REPLACEMENT.get(ip, None)
                 if has_bak:
@@ -270,15 +295,15 @@ ftp_192_168_50_12={
     "username" : "mcn",
     "password" : "meco@2024+",
     "writepath" : "cache",
-    "readpath" : "ftp://183.6.90.205/mnt/NAS/mcn"
+    "readpath" : "ftp://219.136.123.179/mnt/NAS/mcn"
 }
 ftp_183_6_90_205={
-    "host" : "183.6.90.205",
+    "host" : "219.136.123.179",
     "port": 2221,
     "username" : "mcn",
     "password" : "meco@2024+",
     "writepath" : "cache",
-    "readpath" : "ftp://183.6.90.205/mnt/NAS/mcn"
+    "readpath" : "ftp://219.136.123.179/mnt/NAS/mcn"
 }
 
 from ryry import utils
@@ -320,9 +345,9 @@ def get_domain_config(target_domain):
 
 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},
+    "219.136.123.179": {"type": "ftp", "config": ftp_183_6_90_205},
     "ftp://192.168.50.12/mnt/NAS/mcn/cache": {"type": "ftp", "config": ftp_192_168_50_12},
-    "ftp://183.6.90.205/mnt/NAS/mcn/cache": {"type": "ftp", "config": ftp_183_6_90_205},
+    "ftp://219.136.123.179/mnt/NAS/mcn/cache": {"type": "ftp", "config": ftp_183_6_90_205},
     "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},
@@ -331,12 +356,12 @@ DOMAIN_CONFIG = {
 }
 
 FTP_REPLACEMENT = {
-    "192.168.50.12": "183.6.90.205",
-    "183.6.90.205": "192.168.50.12",
+    "192.168.50.12": "219.136.123.179",
+    "219.136.123.179": "192.168.50.12",
 }
 
 SUBDOMAIN = {
-    "183.6.90.205": [
+    "219.136.123.179": [
         ftp_192_168_50_12,
         ftp_183_6_90_205,
     ],
@@ -662,3 +687,5 @@ def downloadDir(url, saveDir, useCount=-1, autoDelete=False):
     except Exception as e:
         print(f"downloadDir fail: {e}")
     return None
+
+print(upload("/Users/pengjun/Downloads/grok_report.mp4", uploadPath="/mnt/NAS/mcn/cache"))

{ryry_cli-4.30 → ryry_cli-5.0/ryry_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 4.30
+Version: 5.0
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen
@@ -25,7 +25,7 @@ Requires-Dist: urllib3
 Requires-Dist: portalocker
 Requires-Dist: PyYAML
 Provides-Extra: with-mecord
-Requires-Dist: mecord-cli>=0.7.405; extra == "with-mecord"
+Requires-Dist: mecord-cli>=0.7.407; extra == "with-mecord"
 
 ryry Python Tool
 ===============================================

{ryry_cli-4.30 → ryry_cli-5.0}/ryry_cli.egg-info/requires.txt

@@ -13,4 +13,4 @@ portalocker
 PyYAML
 
 [with_mecord]
-mecord-cli>=0.7.405
+mecord-cli>=0.7.407

{ryry_cli-4.30 → ryry_cli-5.0}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "4.30"
+ryry_version = "5.0"
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")
 try:
@@ -73,7 +73,7 @@ setuptools.setup(
         'PyYAML'
     ],
     extras_require={
-        'with_mecord': ['mecord-cli>=0.7.405'],
+        'with_mecord': ['mecord-cli>=0.7.407'],
     },
     dependency_links=[],
     entry_points={