ryry-cli 2.67__tar.gz → 2.69__tar.gz

{ryry_cli-2.67 → ryry_cli-2.69}/PKG-INFO

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

ryry_cli-2.69/ryry/constant.py

@@ -0,0 +1,4 @@
+#!!!!! do not change this file !!!!!
+app_version="2.69"
+app_bulld_anchor="Noh_2024-11-01 19:03:14.462655"
+app_name="ryry-cli"

{ryry_cli-2.67 → ryry_cli-2.69}/ryry/upload.py

@@ -189,8 +189,8 @@ SUBDOMAIN = {
         ftp_183_6_90_205,
     ],
     "192.168.3.220": [
-        {**ftp_172_16_3_215,"path_replace": [ "/mcn/", "/mcn/videos/" ]},
-        {**ftp_183_6_45_220,"path_replace": [ "/mcn/", "/mcn/videos/" ]},
+        {**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
     ]
 }
@@ -240,9 +240,9 @@ def download(url, saveDir):
                         ftp.connect(ip, port, timeout=5)
                         ftp.login(username, password)
                     
-                        remote_filepath = parsed_url.path[1:]
                         if len(replace_path) > 0:
-                            remote_filepath = remote_filepath.replace(replace_path[0], replace_path[1])
+                            parsed_url = urlparse(url.replace(replace_path[0], replace_path[1]))
+                        remote_filepath = parsed_url.path[1:]
                         if "." in urlparser.urlparse(url).path:
                             ext = urlparser.urlparse(url).path[urlparser.urlparse(url).path.index("."):]
                             savePath = os.path.join(saveDir, f"{name}{ext}")
@@ -308,9 +308,9 @@ def downloadDir(url, saveDir, useCount=-1, autoDelete=False):
                         ftp.connect(ip, port, timeout=5)
                         ftp.login(username, password)   
                     
-                        remote_filepath = parsed_url.path[1:]
                         if len(replace_path) > 0:
-                            remote_filepath = remote_filepath.replace(replace_path[0], replace_path[1])
+                            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)

{ryry_cli-2.67 → ryry_cli-2.69}/ryry_cli.egg-info/PKG-INFO

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

{ryry_cli-2.67 → ryry_cli-2.69}/setup.py

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

ryry_cli-2.67/ryry/constant.py

@@ -1,4 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.67"
-app_bulld_anchor="Noh_2024-11-01 16:37:20.150320"
-app_name="ryry-cli"