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

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

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

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

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

{ryry_cli-4.9 → ryry_cli-4.11}/ryry/upload.py

@@ -1,4 +1,5 @@
 from urllib.parse import *
+import time
 
 def transcode(srcFile):
     try:
@@ -71,10 +72,10 @@ def upload(src, taskUUID=None, needTranscode=False, keepItAlways=False, addition
             uploadPath = os.path.join('/mnt/NAS/mcn/', uploadPath)
         
 
+    needDeleteSrc = False
     if needTranscode:
         needDeleteSrc, newSrc = transcode(src)
     else:
-        needDeleteSrc = False
         newSrc = src
     
     # 根据targetDomain判断使用不同的上传逻辑
@@ -93,6 +94,7 @@ 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:]
     
     parsed_domain, upload_path = parseDomainAndPath(targetDomain)
     if uploadPath:
@@ -103,7 +105,6 @@ 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)
     
@@ -182,7 +183,6 @@ def uploadToOss(file, new_file_name, oss_config, upload_path=""):
         raise Exception(f"OSS upload failed: {response.status_code}")
 
 def deepFtpUpload(file, new_file_name, ftp, writepath, readpath):
-    import ftplib, os
     try:
         safe_cwd(ftp, writepath)
     except:
@@ -200,20 +200,45 @@ def ftpUpload(file, new_file_name, subdomain, upload_path=""):
     password = subdomain["password"]
     writepath = subdomain["writepath"]
     readpath = subdomain["readpath"]
+    retry = 0
     import ftplib
-    ftp = ftplib.FTP()
-    ftp.connect(ip, port, timeout=5)
-    ftp.login(username, password)  
+    while retry < 3:
+        try:
+            if retry > 0:
+                has_bak = FTP_REPLACEMENT.get(ip, None)
+                if has_bak:
+                    bak_config = DOMAIN_CONFIG.get(has_bak, None)["config"]
+                    ftp = ftplib.FTP()
+                    ftp.connect(bak_config["host"], bak_config["port"], timeout=5)
+                    ftp.login(bak_config["username"], bak_config["password"])  
+                    if upload_path:
+                        if upload_path[0:1] == "/":
+                            upload_path = upload_path[1:]
+                        s = deepFtpUpload(file, new_file_name, ftp, upload_path, f'ftp://{ip}/{upload_path}')
+                    else:
+                        s = deepFtpUpload(file, new_file_name, ftp, writepath, readpath)
+                    
+                    ftp.quit()
+                    return s
 
-    if upload_path:
-        if upload_path[0:1] == "/":
-            upload_path = upload_path[1:]
-        s = deepFtpUpload(file, new_file_name, ftp, upload_path, f'ftp://{ip}/{upload_path}')
-    else:
-        s = deepFtpUpload(file, new_file_name, ftp, writepath, readpath)
-    
-    ftp.quit()
-    return s
+            ftp = ftplib.FTP()
+            ftp.connect(ip, port, timeout=5)
+            ftp.login(username, password)  
+
+            if upload_path:
+                if upload_path[0:1] == "/":
+                    upload_path = upload_path[1:]
+                s = deepFtpUpload(file, new_file_name, ftp, upload_path, f'ftp://{ip}/{upload_path}')
+            else:
+                s = deepFtpUpload(file, new_file_name, ftp, writepath, readpath)
+            
+            ftp.quit()
+            return s
+        except:
+            time.sleep(5)
+        finally:
+            retry+=1
+    raise Exception("uplad fail!")
     
 def _can_connect_ftp(ip, port, username, password, writepath):  
     import ftplib
@@ -299,6 +324,11 @@ DOMAIN_CONFIG = {
     "*.mecordai.com": {"type": "mecord-cli", "config": {}},
 }
 
+FTP_REPLACEMENT = {
+    "192.168.50.12": "183.6.90.205",
+    "183.6.90.205": "192.168.50.12",
+}
+
 SUBDOMAIN = {
     "183.6.90.205": [
         ftp_192_168_50_12,

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

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

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

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