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

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

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

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.39 → ryry_cli-2.40}/ryry/upload.py

@@ -180,6 +180,7 @@ def download(url, saveDir):
                     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 += "/"
@@ -190,6 +191,7 @@ def download(url, saveDir):
                         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")
@@ -200,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:
@@ -216,4 +220,4 @@ def download(url, saveDir):
     return None
 
 # url = upload("D:\\0505.mp4", "111", 300)
-# download("ftp://192.168.3.220/1TB01/data/mcn/digital_female_2", "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.39 → ryry_cli-2.40}/ryry_cli.egg-info/PKG-INFO

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

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

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "2.39"
+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")

ryry_cli-2.39/ryry/constant.py

@@ -1,5 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.39"
-app_bulld_number=239
-app_bulld_anchor="Noh_2024-08-26 19:53:13.939259"
-app_name="ryry-cli"