ryry-cli 2.71__tar.gz → 2.74__tar.gz

{ryry_cli-2.71 → ryry_cli-2.74}/PKG-INFO

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

ryry_cli-2.74/ryry/constant.py

@@ -0,0 +1,4 @@
+#!!!!! do not change this file !!!!!
+app_version="2.74"
+app_bulld_anchor="Noh_2024-11-28 22:09:48.575754"
+app_name="ryry-cli"

{ryry_cli-2.71 → ryry_cli-2.74}/ryry/task.py

@@ -144,7 +144,7 @@ def updateProgress(data, progress=50, taskUUID=None):
         progress = 0
     if progress > 100:
         progress = 100
-    if realTaskUUID and realTaskUUID.startswith("local_") == False:
+    if realTaskUUID and len(realTaskUUID) > 10 and realTaskUUID.startswith("local_") == False:
         return ryry_webapi.TaskUpdateProgress(realTaskUUID, progress, json.dumps(data))
 
 def timeout_killprocess(proc, timeout): # """超过指定的秒数后杀死进程"""

{ryry_cli-2.71 → ryry_cli-2.74}/ryry/upload.py

@@ -78,11 +78,11 @@ def upload(src, taskUUID=None, timeout=300, needTranscode=True, keep_it_always=F
 def deepFtpUpload(file, new_file_name, ftp, writepath, readpath):
     import ftplib, os
     try:
-        ftp.cwd(writepath)
+        safe_cwd(ftp, writepath)
     except ftplib.error_perm as e:
         if e.args[0].startswith('550'):
-            ftp.mkd(writepath)
-            ftp.cwd(writepath)
+            safe_mkd(ftp, writepath)
+            safe_cwd(ftp, writepath)
             
     with open(file, 'rb') as f:
         ftp.storbinary(f'STOR {new_file_name}', f)
@@ -111,87 +111,41 @@ def _can_connect_ftp(ip, port, username, password, writepath):
         ftp.connect(ip, port, timeout=5)
         ftp.login(username, password)  
         try:
-            ftp.cwd(writepath)
+            safe_cwd(ftp, writepath)
         except ftplib.error_perm as e:
             if e.args[0].startswith('550'):
                 # 如果远程目录不存在，则创建它
-                ftp.mkd(writepath)
-                ftp.cwd(writepath)
+                safe_mkd(ftp, writepath)
+                safe_cwd(ftp, writepath)
         ftp.quit()
         return True
     except Exception as e:  
         print(f"Failed to connect to FTP server {ip}:{writepath} {e}")  
-        return False 
-ftp_172_16_3_215={
-    "host" : "172.16.3.215",
+        return False
+ftp_192_168_50_12={
+    "host" : "192.168.50.12",
     "port": 21,
-    "username" : "admin",
-    "password" : "Mecord@2024",
-    "writepath" : "mcn/cache",
-    "readpath" : "ftp://172.16.3.215/mcn/cache"
-}
-ftp_183_6_45_220={
-    "host" : "183.6.45.220",
-    "port": 2121,
-    "username" : "admin",
-    "password" : "Mecord@2024",
-    "writepath" : "mcn/cache",
-    "readpath" : "ftp://183.6.45.220/mcn/cache"
-}
-ftp_192_168_3_220={
-    "host": "192.168.3.220",
-    "port": 21,
-    "username" : "xinyu100",
-    "password" : "xinyu100.com",
-    "writepath" : "1TB01/data/cache/",
-    # "readpath" : "http://192.168.3.220/01/cache"
-    "readpath" : "ftp://192.168.3.220/1TB01/data/cache"
+    "username" : "mcn",
+    "password" : "meco@2024+",
+    "writepath" : "mnt/NAS/mcn/cache",
+    "readpath" : "ftp://192.168.50.12/mnt/NAS/mcn/cache"
 }
 ftp_183_6_90_205={
     "host" : "183.6.90.205",
-    "port": 13210,
-    "username" : "ftpuser",
-    "password" : "ftpuser",
-    "writepath" : "cache/",
-    "readpath" : "ftp://183.6.90.205:13210/cache"
-}
-ftp_192_168_50_113={
-    "host" : "192.168.50.113",
-    "port": 21,
-    "username" : "ftpuser",
-    "password" : "ftpuser",
-    "writepath" : "cache/",
-    "readpath" : "ftp://192.168.50.113/cache"
+    "port": 2221,
+    "username" : "mcn",
+    "password" : "meco@2024+",
+    "writepath" : "mnt/NAS/mcn/cache",
+    "readpath" : "ftp://183.6.90.205/mnt/NAS/mcn/cache"
 }
 SUBDOMAIN = {
-    "183.6.45.220": [
-        ftp_172_16_3_215,
-        ftp_183_6_45_220,
-        {**ftp_192_168_50_113,"path_replace": [ "/mcn/videos/", "/mcn/" ]},
-        {**ftp_183_6_90_205,"path_replace": [ "/mcn/videos/", "/mcn/" ]}
-    ],
-    "172.16.3.215": [
-        ftp_172_16_3_215,
-        ftp_183_6_45_220,
-        {**ftp_192_168_50_113,"path_replace": [ "/mcn/videos/", "/mcn/" ]},
-        {**ftp_183_6_90_205,"path_replace": [ "/mcn/videos/", "/mcn/" ]}
-    ],
-    "192.168.50.113": [
-        {**ftp_172_16_3_215,"path_replace": [ "/mcn/", "/mcn/videos/" ]},
-        {**ftp_183_6_45_220,"path_replace": [ "/mcn/", "/mcn/videos/" ]},
-        ftp_192_168_50_113,
-        ftp_183_6_90_205,
-    ],
     "183.6.90.205": [
-        {**ftp_172_16_3_215,"path_replace": [ "/mcn/", "/mcn/videos/" ]},
-        {**ftp_183_6_45_220,"path_replace": [ "/mcn/", "/mcn/videos/" ]},
-        ftp_192_168_50_113,
+        ftp_192_168_50_12,
         ftp_183_6_90_205,
     ],
-    "192.168.3.220": [
-        {**ftp_172_16_3_215,"path_replace": [ "/1TB01/data/mcn/", "/mcn/videos/" ]},
-        {**ftp_183_6_45_220,"path_replace": [ "/1TB01/data/mcn/", "/mcn/videos/" ]},
-        ftp_192_168_3_220
+    "192.168.50.138": [
+        ftp_192_168_50_12,
+        ftp_183_6_90_205,
     ]
 }
 
@@ -242,7 +196,7 @@ def download(url, saveDir):
                     
                         if len(replace_path) > 0:
                             parsed_url = urlparse(url.replace(replace_path[0], replace_path[1]))
-                        remote_filepath = parsed_url.path[1:]
+                        remote_filepath = parsed_url.path
                         if "." in urlparser.urlparse(url).path:
                             ext = urlparser.urlparse(url).path[urlparser.urlparse(url).path.index("."):]
                             savePath = os.path.join(saveDir, f"{name}{ext}")
@@ -250,9 +204,7 @@ def download(url, saveDir):
                                 ftp.retrbinary(f'RETR {remote_filepath}', f.write)
                             return savePath
                         else:
-                            if remote_filepath[-1:] != "/":
-                                remote_filepath += "/"
-                            ftp.cwd(remote_filepath)
+                            safe_cwd(ftp, remote_filepath)
                             files = ftp.nlst()
                             if files:
                                 random_file = random.choice(files)
@@ -285,6 +237,74 @@ def download(url, saveDir):
         print(f"download fail: {e}")
     return None
 
+def safe_cwd(ftp, path):
+    try:
+        ftp.cwd(path)
+        return
+    except:
+        pass
+    
+    if path[0:1] == "/":
+        try:
+            ftp.cwd(path.lstrip('/'))
+            return
+        except:
+            pass
+    else:
+        try:
+            ftp.cwd('/' + path)
+            return
+        except:
+            pass
+        
+    if path[-1:] != "/":
+        try:
+            ftp.cwd(path + "/")
+            return
+        except:
+            pass
+    else:
+        try:
+            ftp.cwd(path.rstrip('/'))
+            return
+        except:
+            pass
+    raise Exception("cwd fail!")
+
+def safe_mkd(ftp, path):
+    try:
+        ftp.mkd(path)
+        return
+    except:
+        pass
+    
+    if path[0:1] == "/":
+        try:
+            ftp.mkd(path.lstrip('/'))
+            return
+        except:
+            pass
+    else:
+        try:
+            ftp.mkd('/' + path)
+            return
+        except:
+            pass
+        
+    if path[-1:] != "/":
+        try:
+            ftp.mkd(path + "/")
+            return
+        except:
+            pass
+    else:
+        try:
+            ftp.mkd(path.rstrip('/'))
+            return
+        except:
+            pass
+    raise Exception("cwd fail!")
+
 def downloadDir(url, saveDir, useCount=-1, autoDelete=False):
     import uuid, os
     if len(url) <= 0:
@@ -310,10 +330,8 @@ def downloadDir(url, saveDir, useCount=-1, autoDelete=False):
                     
                         if len(replace_path) > 0:
                             parsed_url = urlparse(url.replace(replace_path[0], replace_path[1]))
-                        remote_filepath = parsed_url.path[1:]
-                        if remote_filepath[-1:] != "/":
-                            remote_filepath += "/"
-                        ftp.cwd(remote_filepath)
+                        remote_filepath = parsed_url.path
+                        safe_cwd(ftp, remote_filepath)
                         files = ftp.nlst()
                         savePath = os.path.join(saveDir, f"{name}")
                         if os.path.exists(savePath) == False:

{ryry_cli-2.71 → ryry_cli-2.74}/ryry_cli.egg-info/PKG-INFO

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

{ryry_cli-2.71 → ryry_cli-2.74}/setup.py

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

ryry_cli-2.71/ryry/constant.py

@@ -1,4 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.71"
-app_bulld_anchor="Noh_2024-11-08 17:48:28.467173"
-app_name="ryry-cli"