ryry-cli 2.37__tar.gz → 2.40__tar.gz

{ryry_cli-2.37 → ryry_cli-2.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 2.37
+Version: 2.40
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen
@@ -19,6 +19,7 @@ Requires-Dist: psutil
 Requires-Dist: pynvml
 Requires-Dist: requests_toolbelt
 Requires-Dist: matplotlib
+Requires-Dist: fake_useragent
 Requires-Dist: ping3
 Requires-Dist: piexif
 Requires-Dist: gputil

ryry_cli-2.40/ryry/constant.py

@@ -0,0 +1,5 @@
+#!!!!! do not change this file !!!!!
+app_version="2.40"
+app_bulld_number=240
+app_bulld_anchor="Noh_2024-08-26 20:04:08.243117"
+app_name="ryry-cli"

{ryry_cli-2.37 → ryry_cli-2.40}/ryry/ryry_server_socket.py

@@ -170,7 +170,7 @@ class RyryShortConnectThread(Thread):
     def run(self):
         print(f"   {self.name} start")
         min_wait_time = 2
-        max_wait_time = 10
+        max_wait_time = 30
         wait_time = min_wait_time
         consecutive_step = 2
         consecutive_failures = 0

{ryry_cli-2.37 → ryry_cli-2.40}/ryry/upload.py

@@ -160,11 +160,9 @@ def download(url, saveDir):
         return None
     try:
         name = ''.join(str(uuid.uuid4()).split('-'))
-        ext = urlparser.urlparse(url).path[urlparser.urlparse(url).path.index("."):]
-        savePath = os.path.join(saveDir, f"{name}{ext}")
         
         if url.startswith("ftp"):
-            import ftplib
+            import ftplib, random
             parsed_url = urlparse(url)  
             host = parsed_url.hostname
             if host in SUBDOMAIN:
@@ -177,8 +175,23 @@ def download(url, saveDir):
                 ftp.login(username, password)  
             
                 remote_filepath = parsed_url.path[1:]
-                with open(savePath, 'wb') as f:  
-                    ftp.retrbinary(f'RETR {remote_filepath}', f.write)  
+                if "." in urlparser.urlparse(url).path:
+                    ext = urlparser.urlparse(url).path[urlparser.urlparse(url).path.index("."):]
+                    savePath = os.path.join(saveDir, f"{name}{ext}")
+                    with open(savePath, 'wb') as f:  
+                        ftp.retrbinary(f'RETR {remote_filepath}', f.write)
+                    return savePath
+                else:
+                    if remote_filepath[-1:] != "/":
+                        remote_filepath += "/"
+                    ftp.cwd(remote_filepath)
+                    files = ftp.nlst()
+                    if files:
+                        random_file = random.choice(files)
+                        savePath = os.path.join(saveDir, f"{name}_{random_file}")
+                        with open(savePath, 'wb') as f:  
+                            ftp.retrbinary(f'RETR {random_file}', f.write)  
+                        return savePath
                 ftp.quit()  
             else:
                 print(f"download fail: domain {host} not support")
@@ -189,6 +202,8 @@ def download(url, saveDir):
             s.headers.update({'Connection':'close'})
             ua = UserAgent()
             file = s.get(url, verify=False, headers={'User-Agent': ua.random}, timeout=30)
+            ext = urlparser.urlparse(url).path[urlparser.urlparse(url).path.index("."):]
+            savePath = os.path.join(saveDir, f"{name}{ext}")
             if os.path.exists(savePath):
                 os.remove(savePath)
             with open(savePath, "wb") as c:
@@ -205,4 +220,4 @@ def download(url, saveDir):
     return None
 
 # url = upload("D:\\0505.mp4", "111", 300)
-# download(url, "D:\\")
+# download("ftp://192.168.3.220/1TB01/data/mcn/digital_male_1", "E:\\semi-automatic_mixed_video-main\\task_system\\widget\\gen_template_video\\.temp")

{ryry_cli-2.37 → ryry_cli-2.40}/ryry_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 2.37
+Version: 2.40
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen
@@ -19,6 +19,7 @@ Requires-Dist: psutil
 Requires-Dist: pynvml
 Requires-Dist: requests_toolbelt
 Requires-Dist: matplotlib
+Requires-Dist: fake_useragent
 Requires-Dist: ping3
 Requires-Dist: piexif
 Requires-Dist: gputil

{ryry_cli-2.37 → ryry_cli-2.40}/ryry_cli.egg-info/requires.txt

@@ -6,6 +6,7 @@ psutil
 pynvml
 requests_toolbelt
 matplotlib
+fake_useragent
 ping3
 piexif
 gputil

{ryry_cli-2.37 → ryry_cli-2.40}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "2.37"
+ryry_version = "2.40"
 ryry_build_number = int(ryry_version.replace(".",""))
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")
@@ -57,6 +57,7 @@ setuptools.setup(
         'pynvml',
         'requests_toolbelt',
         'matplotlib',
+        'fake_useragent',
         'ping3',
         'piexif',
         'gputil',

ryry_cli-2.37/ryry/constant.py

@@ -1,5 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.37"
-app_bulld_number=237
-app_bulld_anchor="Noh_2024-08-23 10:43:12.640901"
-app_name="ryry-cli"