ryry-cli 2.70__tar.gz → 2.73__tar.gz

{ryry_cli-2.70 → ryry_cli-2.73}/PKG-INFO

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

ryry_cli-2.73/ryry/constant.py

@@ -0,0 +1,4 @@
+#!!!!! do not change this file !!!!!
+app_version="2.73"
+app_bulld_anchor="Noh_2024-11-12 14:30:55.602732"
+app_name="ryry-cli"

{ryry_cli-2.70 → ryry_cli-2.73}/ryry/ryry_webapi.py

@@ -178,18 +178,21 @@ def TaskCancel(taskUUID):
         return False
     return True
 
-def _upload(localFilePath, ext):
+def _upload(localFilePath, ext, keep_it_always=False):
     with open(localFilePath, "rb") as f:
         files = { 'file':f }
         params = { 'ext':ext }
-        r1, r2, r3 = _aigc_post("upload/create", params, files=files,timeout=100)
+        if keep_it_always:
+            r1, r2, r3 = _aigc_post("upload/datanet", params, files=files,timeout=100)
+        else:
+            r1, r2, r3 = _aigc_post("upload/create", params, files=files,timeout=100)
     if r1 != 0:
         raise Exception(f"upload fail!, reason={r2}")
     return r3
 
-def upload(localFilePath, ext):
+def upload(localFilePath, ext, keep_it_always=False):
     try:
-        return _upload(localFilePath, ext)
+        return _upload(localFilePath, ext, keep_it_always)
     except:
         pass
     from mecord import upload as mecord_upload

{ryry_cli-2.70 → ryry_cli-2.73}/ryry/task.py

@@ -144,7 +144,7 @@ def updateProgress(data, progress=50, taskUUID=None):
         progress = 0
     if progress > 100:
         progress = 100
-    if realTaskUUID and realTaskUUID.startswith("local_") == False:
+    if realTaskUUID and len(realTaskUUID) > 10 and realTaskUUID.startswith("local_") == False:
         return ryry_webapi.TaskUpdateProgress(realTaskUUID, progress, json.dumps(data))
 
 def timeout_killprocess(proc, timeout): # """超过指定的秒数后杀死进程"""

{ryry_cli-2.70 → ryry_cli-2.73}/ryry/upload.py

@@ -43,7 +43,7 @@ def additionalUrl(srcFile, ossUrl):
     except:
         return ossUrl
 
-def upload(src, taskUUID=None, timeout=300, needTranscode=True):
+def upload(src, taskUUID=None, timeout=300, needTranscode=True, keep_it_always=False):
     import os
     from pathlib import Path
     from ryry import taskUtils
@@ -68,7 +68,7 @@ def upload(src, taskUUID=None, timeout=300, needTranscode=True):
     else:
         from ryry import ryry_webapi
         file_name = Path(newSrc).name
-        ossurl = ryry_webapi.upload(newSrc, os.path.splitext(file_name)[-1][1:])
+        ossurl = ryry_webapi.upload(newSrc, os.path.splitext(file_name)[-1][1:], keep_it_always)
         
     ossurl = additionalUrl(newSrc, ossurl)
     if needDeleteSrc:
@@ -122,76 +122,30 @@ def _can_connect_ftp(ip, port, username, password, writepath):
     except Exception as e:  
         print(f"Failed to connect to FTP server {ip}:{writepath} {e}")  
         return False 
-ftp_172_16_3_215={
-    "host" : "172.16.3.215",
+ftp_192_168_50_138={
+    "host" : "192.168.50.138",
     "port": 21,
     "username" : "admin",
     "password" : "Mecord@2024",
     "writepath" : "mcn/cache",
-    "readpath" : "ftp://172.16.3.215/mcn/cache"
+    "readpath" : "ftp://192.168.50.138/mcn/cache"
 }
-ftp_183_6_45_220={
-    "host" : "183.6.45.220",
+ftp_183_6_90_205={
+    "host" : "183.6.90.205",
     "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,
-    "username" : "xinyu100",
-    "password" : "xinyu100.com",
-    "writepath" : "1TB01/data/cache/",
-    # "readpath" : "http://192.168.3.220/01/cache"
-    "readpath" : "ftp://192.168.3.220/1TB01/data/cache"
-}
-ftp_183_6_90_205={
-    "host" : "183.6.90.205",
-    "port": 13210,
-    "username" : "ftpuser",
-    "password" : "ftpuser",
-    "writepath" : "cache/",
-    "readpath" : "ftp://183.6.90.205:13210/cache"
-}
-ftp_192_168_50_113={
-    "host" : "192.168.50.113",
-    "port": 21,
-    "username" : "ftpuser",
-    "password" : "ftpuser",
-    "writepath" : "cache/",
-    "readpath" : "ftp://192.168.50.113/cache"
+    "readpath" : "ftp://183.6.90.205/mcn/cache"
 }
 SUBDOMAIN = {
-    "183.6.45.220": [
-        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_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,"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,"path_replace": [ "/mcn/", "/mcn/videos/" ]},
-        {**ftp_183_6_45_220,"path_replace": [ "/mcn/", "/mcn/videos/" ]},
-        ftp_192_168_50_113,
+        ftp_192_168_50_138,
         ftp_183_6_90_205,
     ],
-    "192.168.3.220": [
-        {**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
+    "192.168.50.138": [
+        ftp_192_168_50_138,
+        ftp_183_6_90_205,
     ]
 }
 

{ryry_cli-2.70 → ryry_cli-2.73}/ryry_cli.egg-info/PKG-INFO

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

{ryry_cli-2.70 → ryry_cli-2.73}/setup.py

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

ryry_cli-2.70/ryry/constant.py

@@ -1,4 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.70"
-app_bulld_anchor="Noh_2024-11-05 10:03:24.328585"
-app_name="ryry-cli"