ryry-cli 2.66__tar.gz → 2.68__tar.gz

{ryry_cli-2.66 → ryry_cli-2.68}/PKG-INFO

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

ryry_cli-2.68/ryry/constant.py

@@ -0,0 +1,4 @@
+#!!!!! do not change this file !!!!!
+app_version="2.68"
+app_bulld_anchor="Noh_2024-11-01 17:05:45.402867"
+app_name="ryry-cli"

{ryry_cli-2.66 → ryry_cli-2.68}/ryry/upload.py

@@ -130,6 +130,14 @@ ftp_172_16_3_215={
     "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,
@@ -156,33 +164,33 @@ ftp_192_168_50_113={
     "readpath" : "ftp://192.168.50.113/cache"
 }
 SUBDOMAIN = {
+    "183.6.45.220:2121": [
+        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_192_168_50_113.update({
-            "path_replace": [ "/mcn/videos/", "/mcn/" ]
-        }),
-        ftp_183_6_90_205.update({
-            "path_replace": [ "/mcn/videos/", "/mcn/" ]
-        })
+        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.update({
-            "path_replace": [ "/mcn/", "/mcn/videos/" ]
-        }),
+        {**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.update({
-            "path_replace": [ "/mcn/", "/mcn/videos/" ]
-        }),
+        {**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,
     ],
     "192.168.3.220": [
-        ftp_172_16_3_215.update({
-            "path_replace": [ "/mcn/", "/mcn/videos/" ]
-        }),
+        {**ftp_172_16_3_215,"path_replace": [ "/mcn/", "/mcn/videos/" ]},
+        {**ftp_183_6_45_220,"path_replace": [ "/mcn/", "/mcn/videos/" ]},
         ftp_192_168_3_220
     ]
 }
@@ -232,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}")
@@ -300,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.66 → ryry_cli-2.68}/ryry_cli.egg-info/PKG-INFO

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

{ryry_cli-2.66 → ryry_cli-2.68}/setup.py

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

ryry_cli-2.66/ryry/constant.py

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