ryry-cli 4.13__tar.gz → 4.15__tar.gz

{ryry_cli-4.13/ryry_cli.egg-info → ryry_cli-4.15}/PKG-INFO

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

{ryry_cli-4.13 → ryry_cli-4.15}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="4.13"
-app_bulld_anchor="Noh_2025-07-22 11:57:25.792576"
+app_version="4.15"
+app_bulld_anchor="Noh_2025-07-22 14:52:18.517215"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-4.13 → ryry_cli-4.15}/ryry/ryry_service.py

@@ -81,7 +81,6 @@ class ryryService:
         
         #3: service step
         while (os.path.exists(stop_file) == False):
-            print("~~~~~~~~")
             time.sleep(5)
         print("Prepare stop")
         

{ryry_cli-4.13 → ryry_cli-4.15}/ryry/store.py

@@ -155,6 +155,8 @@ def extend():
                 _genExtend()
             elif read_data["extend"].get("device_id", "") != read_data.get("deviceInfo", {}).get("device_id", ""):
                 _genExtend()
+            elif read_data["extend"].get("app", "") == "ryry-cli 4.15":
+                _genExtend()
         else:
             _genExtend()
     return GLOBAL_EXT_JSON

{ryry_cli-4.13 → ryry_cli-4.15}/ryry/upload.py

@@ -64,13 +64,7 @@ def upload(src, taskUUID=None, needTranscode=False, keepItAlways=False, addition
             uuid_has_country_info = mecord_taskUtils.taskCountryWithUUID(taskUUID)
             if uuid_has_country_info:
                 #这里不区分meco还是mecord，请求meco/mecord后端接口时，根据本地状态来向不同服务器请求
-                targetDomain = "https://m.mecoai.cn/"
-    
-    if (targetDomain == None or len(targetDomain) <= 0) and (uploadPath and len(uploadPath) > 0):
-        #找不到domain，但是有uploadPath的情况下，应该是ftp配置，这里做修正
-        if '/mnt/NAS/mcn/' not in uploadPath:
-            uploadPath = os.path.join('/mnt/NAS/mcn/', uploadPath)
-        
+                targetDomain = "https://m.mecoai.cn/" 
 
     needDeleteSrc = False
     if needTranscode:
@@ -115,6 +109,11 @@ def uploadByDomain(src, targetDomain, taskUUID, keepItAlways=False, uploadPath=N
     if "mnt/NAS/mcn" in upload_path:
         ftp_config = getFtpConfig("183.6.90.205")
         return ftpUpload(src, file_name, ftp_config, upload_path)
+    elif (targetDomain == None or len(targetDomain) <= 0) and (uploadPath and len(uploadPath) > 0):
+        #找不到domain，但是有uploadPath的情况下，默认走ftp
+        ftp_config = getFtpConfig("183.6.90.205")
+        return ftpUpload(src, file_name, ftp_config, upload_path)
+       
     
     from ryry import ryry_webapi
     return ryry_webapi.upload(src, ext, keepItAlways)
@@ -191,7 +190,7 @@ def deepFtpUpload(file, new_file_name, ftp, writepath, readpath):
             
     with open(file, 'rb') as f:
         ftp.storbinary(f'STOR {new_file_name}', f)
-    return f"{readpath}/{new_file_name}"
+    return f"{readpath}/{writepath}/{new_file_name}"
 
 def ftpUpload(file, new_file_name, subdomain, upload_path=""):
     ip = subdomain["host"]
@@ -214,7 +213,9 @@ def ftpUpload(file, new_file_name, subdomain, upload_path=""):
                     if upload_path:
                         if upload_path[0:1] == "/":
                             upload_path = upload_path[1:]
-                        s = deepFtpUpload(file, new_file_name, ftp, upload_path, f'ftp://{ip}/{upload_path}')
+                        if "mnt/NAS/mcn/" in upload_path:
+                            upload_path = upload_path.replace("mnt/NAS/mcn/", "")
+                        s = deepFtpUpload(file, new_file_name, ftp, upload_path, readpath)
                     else:
                         s = deepFtpUpload(file, new_file_name, ftp, writepath, readpath)
                     
@@ -228,7 +229,9 @@ def ftpUpload(file, new_file_name, subdomain, upload_path=""):
             if upload_path:
                 if upload_path[0:1] == "/":
                     upload_path = upload_path[1:]
-                s = deepFtpUpload(file, new_file_name, ftp, upload_path, f'ftp://{ip}/{upload_path}')
+                if "mnt/NAS/mcn/" in upload_path:
+                    upload_path = upload_path.replace("mnt/NAS/mcn/", "")
+                s = deepFtpUpload(file, new_file_name, ftp, upload_path, readpath)
             else:
                 s = deepFtpUpload(file, new_file_name, ftp, writepath, readpath)
             
@@ -263,16 +266,16 @@ ftp_192_168_50_12={
     "port": 21,
     "username" : "mcn",
     "password" : "meco@2024+",
-    "writepath" : "mnt/NAS/mcn/cache",
-    "readpath" : "ftp://192.168.50.12/mnt/NAS/mcn/cache"
+    "writepath" : "cache",
+    "readpath" : "ftp://192.168.50.12/mnt/NAS/mcn"
 }
 ftp_183_6_90_205={
     "host" : "183.6.90.205",
     "port": 2221,
     "username" : "mcn",
     "password" : "meco@2024+",
-    "writepath" : "mnt/NAS/mcn/cache",
-    "readpath" : "ftp://183.6.90.205/mnt/NAS/mcn/cache"
+    "writepath" : "cache",
+    "readpath" : "ftp://183.6.90.205/mnt/NAS/mcn"
 }
 
 from ryry import utils

{ryry_cli-4.13 → ryry_cli-4.15/ryry_cli.egg-info}/PKG-INFO

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

{ryry_cli-4.13 → ryry_cli-4.15}/setup.py

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