ryry-cli 4.14__tar.gz → 4.16__tar.gz

{ryry_cli-4.14/ryry_cli.egg-info → ryry_cli-4.16}/PKG-INFO

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

{ryry_cli-4.14 → ryry_cli-4.16}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="4.14"
-app_bulld_anchor="Noh_2025-07-22 14:21:58.369577"
+app_version="4.16"
+app_bulld_anchor="Noh_2025-07-22 16:42:23.102783"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-4.14 → ryry_cli-4.16}/ryry/daemon_manager.py

@@ -238,8 +238,8 @@ class DaemonManager:
                 return True
             
             try:
-                # 发送停止命令
-                response = self._send_command_to_process(widget_id, {"type": "stop"}, 600)
+                # 发送停止命令（最长等待1小时是否正常结束）
+                response = self._send_command_to_process(widget_id, {"type": "stop"}, 3600)
                 if response and response.get("type") == "stop_result":
                     # 等待进程结束
                     start_time = time.time()

{ryry_cli-4.14 → ryry_cli-4.16}/ryry/main.py

@@ -102,10 +102,10 @@ def widget_status(stdscr, idx):
         name = widget_map[it]["name"]
         version = widget_map[it].get("version", "1.0")
         max_task_number = widget_map[it].get("max_task_number", 1)
-        timeout = widget_map[it].get("timeout", 600)
+        timeout = widget_map[it].get("timeout", 0)
         end_args = ""
         if is_block:
-            end_args = "[X]"
+            end_args += "[X]"
         
         # 检查daemon状态
         color_pair = 0
@@ -120,11 +120,14 @@ def widget_status(stdscr, idx):
         elif daemon_manager and daemon_manager.should_start_daemon(it):
             color_pair = 2
             end_args += "[后台未运行]"  # 应该启动但未运行
-        
+        #检查timeout，如果没有填写不显示
+        if timeout > 0:
+            end_args += f" OOT:{timeout}s"
+            
         max_task_number_str = ""
         if max_task_number > 0:
             max_task_number_str = f"*{max_task_number}"
-        real_stdsrc(idx, 0, scr_str(f'{f"[{name}{max_task_number_str} v{version}] {it}{end_args} OOT:{timeout}s".ljust(maxJust)}'.ljust(ll*3-2)), curses.color_pair(color_pair))
+        real_stdsrc(idx, 0, scr_str(f'{f"[{name}{max_task_number_str} v{version}] {it}{end_args}".ljust(maxJust)}'.ljust(ll*3-2)), curses.color_pair(color_pair))
         idx+=1
         real_stdsrc(idx, 0, scr_str(f'  PATH:{path}'.ljust(ll*3-2)))
         idx+=1

{ryry_cli-4.14 → ryry_cli-4.16}/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.14 → ryry_cli-4.16}/ryry/store.py

@@ -155,14 +155,13 @@ 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.14":
+            elif read_data["extend"].get("app", "") == "ryry-cli 4.16":
                 _genExtend()
         else:
             _genExtend()
     return GLOBAL_EXT_JSON
 
 def _genExtend():
-    print("asdasdas _genExtend ")
     sp = Store()
     read_data = sp.read()
     if "deviceInfo" in read_data:

{ryry_cli-4.14 → ryry_cli-4.16}/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)
@@ -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}/mnt/NAS/mcn')
+                        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}/mnt/NAS/mcn')
+                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)
             

{ryry_cli-4.14 → ryry_cli-4.16/ryry_cli.egg-info}/PKG-INFO

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

{ryry_cli-4.14 → ryry_cli-4.16}/setup.py

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