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

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

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

ryry_cli-2.41/ryry/constant.py

@@ -0,0 +1,5 @@
+#!!!!! do not change this file !!!!!
+app_version="2.41"
+app_bulld_number=241
+app_bulld_anchor="Noh_2024-08-26 21:44:39.946932"
+app_name="ryry-cli"

{ryry_cli-2.39 → ryry_cli-2.41}/ryry/ryry_webapi.py

@@ -196,7 +196,7 @@ def uploadWidget(widget_id, name, whl, ext, version):
             'version':version,
             'ext':ext
         }
-        r1, r2, r3 = _aigc_post("aigc/task/publishWidget", params, files=files, timeout=100)
+        r1, r2, r3 = _aigc_post("aigc/task/publishWidget", params, files=files, timeout=300)
     if r1 != 0:
         raise Exception(f"upload widget fail!, reason={r2}")
     return r3

{ryry_cli-2.39 → ryry_cli-2.41}/ryry/ryry_widget.py

@@ -168,6 +168,7 @@ def addWidgetToEnv(root, mute=False):
         version = package.version
         root = os.path.join(package.location, name.replace("-", "_"))
     except:
+        root = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), name.replace("-", "_"))
         pass
     print(root)
     if CheckWidgetDataInPath(root) == False:
@@ -420,6 +421,7 @@ def installWidget(name):
     local_version = _local_package_version(name)
     if compare_versions(remote_version, local_version) > 0:
         #update
+        print(f"install -> {package_url}")
         pipReInstall(name, package_url)
         widgetInstallNotify(name, remote_version)
         addWidgetToEnv(name)

{ryry_cli-2.39 → ryry_cli-2.41}/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:
@@ -215,5 +219,44 @@ def download(url, saveDir):
         print(f"download fail: {e}")
     return None
 
+def downloadDir(url, saveDir):
+    import uuid, os
+    if len(url) <= 0:
+        return None
+    try:
+        name = ''.join(str(uuid.uuid4()).split('-'))
+        
+        if url.startswith("ftp"):
+            import ftplib, random
+            parsed_url = urlparse(url)  
+            host = parsed_url.hostname
+            if host in SUBDOMAIN:
+                ip = SUBDOMAIN[host]["host"]
+                username = SUBDOMAIN[host]["username"]
+                password = SUBDOMAIN[host]["password"]
+                ftp = ftplib.FTP(ip, timeout=3)  
+                ftp.login(username, password)  
+            
+                remote_filepath = parsed_url.path[1:]
+                if remote_filepath[-1:] != "/":
+                    remote_filepath += "/"
+                ftp.cwd(remote_filepath)
+                files = ftp.nlst()
+                savePath = os.path.join(saveDir, f"{name}")
+                if os.path.exists(savePath) == False:
+                    os.makedirs(savePath)
+                for file in files:
+                    with open(os.path.join(savePath, file), 'wb') as f:  
+                        ftp.retrbinary(f'RETR {file}', f.write)  
+                ftp.quit()  
+                return savePath
+            else:
+                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
+
 # 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.41}/ryry_cli.egg-info/PKG-INFO

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

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

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