ryry-cli 2.63__tar.gz → 2.65__tar.gz

{ryry_cli-2.63 → ryry_cli-2.65}/PKG-INFO

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

ryry_cli-2.65/ryry/constant.py

@@ -0,0 +1,4 @@
+#!!!!! do not change this file !!!!!
+app_version="2.65"
+app_bulld_anchor="Noh_2024-11-01 14:55:54.014288"
+app_name="ryry-cli"

{ryry_cli-2.63 → ryry_cli-2.65}/ryry/upload.py

@@ -97,7 +97,7 @@ def ftpUpload(file, new_file_name, subdomain):
     readpath = subdomain["readpath"]
     import ftplib
     ftp = ftplib.FTP()
-    ftp.connect(ip, port, timeout=3)
+    ftp.connect(ip, port, timeout=5)
     ftp.login(username, password)  
 
     s = deepFtpUpload(file, new_file_name, ftp, writepath, readpath)
@@ -108,7 +108,7 @@ def _can_connect_ftp(ip, port, username, password, writepath):
     import ftplib
     try:
         ftp = ftplib.FTP()
-        ftp.connect(ip, port, timeout=3)
+        ftp.connect(ip, port, timeout=5)
         ftp.login(username, password)  
         try:
             ftp.cwd(writepath)
@@ -122,71 +122,79 @@ def _can_connect_ftp(ip, port, username, password, writepath):
     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",
+    "port": 21,
+    "username" : "admin",
+    "password" : "Mecord@2024",
+    "writepath" : "mcn/cache",
+    "readpath" : "ftp://172.16.3.215/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"
+}
+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"
+}
 SUBDOMAIN = {
-    "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"
-        }
+    "172.16.3.215": [
+        ftp_172_16_3_215,
+        ftp_192_168_50_113,
+        ftp_183_6_90_205
     ],
     "192.168.50.113": [
-        {
-            "host" : "192.168.50.113",
-            "port": 21,
-            "username" : "ftpuser",
-            "password" : "ftpuser",
-            "writepath" : "cache/",
-            "readpath" : "ftp://192.168.50.113/cache"
-        },
-        {
-            "host" : "183.6.90.205",
-            "port": 13210,
-            "username" : "ftpuser",
-            "password" : "ftpuser",
-            "writepath" : "cache/",
-            "readpath" : "ftp://192.168.50.113/cache"
-        },
+        ftp_172_16_3_215,
+        ftp_192_168_50_113,
+        ftp_183_6_90_205,
     ],
     "183.6.90.205": [
-        {
-            "host" : "192.168.50.113",
-            "port": 21,
-            "username" : "ftpuser",
-            "password" : "ftpuser",
-            "writepath" : "cache/",
-            "readpath" : "ftp://192.168.50.113/cache"
-        },
-        {
-            "host" : "183.6.90.205",
-            "port": 13210,
-            "username" : "ftpuser",
-            "password" : "ftpuser",
-            "writepath" : "cache/",
-            "readpath" : "ftp://192.168.50.113/cache"
-        },
+        ftp_172_16_3_215,
+        ftp_192_168_50_113,
+        ftp_183_6_90_205,
+    ],
+    "192.168.3.220": [
+        ftp_172_16_3_215,
+        ftp_192_168_3_220
     ]
 }
+
 def getSubdomain(targetDomain):
     if len(targetDomain) <= 0:
         return None
     for ip in SUBDOMAIN.keys():
-        if targetDomain == SUBDOMAIN[ip]["readpath"]:
-            if _can_connect_ftp(ip, SUBDOMAIN[ip]["username"], SUBDOMAIN[ip]["port"], SUBDOMAIN[ip]["password"], SUBDOMAIN[ip]["writepath"]):
-                return SUBDOMAIN[ip]
+        for host_item in SUBDOMAIN[ip]:
+            if targetDomain == host_item["readpath"]:
+                if _can_connect_ftp(ip, host_item["username"], host_item["port"], host_item["password"], host_item["writepath"]):
+                    return host_item
     return None
 
 def getFirstSupportSubdomain():
     for ip in SUBDOMAIN.keys():
-        if _can_connect_ftp(ip, SUBDOMAIN[ip]["username"], SUBDOMAIN[ip]["port"], SUBDOMAIN[ip]["password"], SUBDOMAIN[ip]["writepath"]):
-            return SUBDOMAIN[ip]
+        for host_item in SUBDOMAIN[ip]:
+            if _can_connect_ftp(ip, host_item["username"], host_item["port"], host_item["password"], host_item["writepath"]):
+                return host_item
     return None
 
+
 def download(url, saveDir):
     import uuid, requests, os
     from urlparser import urlparser
@@ -210,7 +218,7 @@ def download(url, saveDir):
                         writepath = host_item["writepath"]
                         readpath = host_item["readpath"]
                         ftp = ftplib.FTP()
-                        ftp.connect(ip, port, timeout=3)
+                        ftp.connect(ip, port, timeout=5)
                         ftp.login(username, password)  
                     
                         remote_filepath = parsed_url.path[1:]
@@ -275,7 +283,7 @@ def downloadDir(url, saveDir, useCount=-1, autoDelete=False):
                         username = host_item["username"]
                         password = host_item["password"]
                         ftp = ftplib.FTP()
-                        ftp.connect(ip, port, timeout=3)
+                        ftp.connect(ip, port, timeout=5)
                         ftp.login(username, password)   
                     
                         remote_filepath = parsed_url.path[1:]
@@ -291,18 +299,19 @@ def downloadDir(url, saveDir, useCount=-1, autoDelete=False):
                         for file in files:
                             with open(os.path.join(savePath, file), 'wb') as f:  
                                 ftp.retrbinary(f'RETR {file}', f.write)
-                                if autoDelete:
-                                    try:
-                                        ftp.delete(file)
-                                    except Exception as e:
-                                        print(f"Error deleting file {file}: {e}")
-                        ftp.quit()  
+                            if autoDelete:
+                                try:
+                                    ftp.delete(file)
+                                except Exception as e:
+                                    print(f"Error deleting file {file}: {e}")
+                        ftp.quit()
                         return savePath
-                    except:
+                    except Exception as ex:
+                        print(ex)
                         pass
             print(f"downloadDir fail: domain {host} not support")
         else:
             print(f"url {url} not support")
     except Exception as e:
         print(f"downloadDir fail: {e}")
-    return None
+    return None

{ryry_cli-2.63 → ryry_cli-2.65}/ryry_cli.egg-info/PKG-INFO

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

{ryry_cli-2.63 → ryry_cli-2.65}/setup.py

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

ryry_cli-2.63/ryry/constant.py

@@ -1,4 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.63"
-app_bulld_anchor="Noh_2024-09-29 15:54:27.681513"
-app_name="ryry-cli"