ryry-cli 4.20__tar.gz → 4.22__tar.gz

{ryry_cli-4.20/ryry_cli.egg-info → ryry_cli-4.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 4.20
+Version: 4.22
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen
@@ -23,7 +23,8 @@ Requires-Dist: gputil
 Requires-Dist: urlparser
 Requires-Dist: urllib3
 Requires-Dist: portalocker
-Requires-Dist: mecord-cli>=0.7.405
+Provides-Extra: with-mecord
+Requires-Dist: mecord-cli>=0.7.405; extra == "with-mecord"
 
 ryry Python Tool
 ===============================================

{ryry_cli-4.20 → ryry_cli-4.22}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="4.20"
-app_bulld_anchor="Noh_2025-07-23 22:54:54.495460"
+app_version="4.22"
+app_bulld_anchor="Noh_2025-07-24 11:12:04.496003"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-4.20 → ryry_cli-4.22}/ryry/daemon_base.py

@@ -6,6 +6,7 @@ import signal
 import threading
 from typing import Optional, Dict, Any
 from ryry import ryry_webapi
+import platform
 
 class SimpleDaemonBase:
     """
@@ -56,7 +57,8 @@ class SimpleDaemonBase:
             self.running = False
         
         # 注册信号处理器
-        signal.signal(signal.SIGINT, signal_handler)   # Ctrl+C
+        if platform.system() != "Windows":
+            signal.signal(signal.SIGINT, signal_handler)   # Ctrl+C (在Windows上禁用)
         signal.signal(signal.SIGTERM, signal_handler)  # 终止信号
         
         if hasattr(signal, 'SIGBREAK'):

{ryry_cli-4.20 → ryry_cli-4.22}/ryry/store.py

@@ -155,7 +155,7 @@ 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.20":
+            elif read_data["extend"].get("app", "") == "ryry-cli 4.22":
                 _genExtend()
         else:
             _genExtend()

{ryry_cli-4.20 → ryry_cli-4.22}/ryry/upload.py

@@ -106,13 +106,17 @@ def uploadByDomain(src, targetDomain, taskUUID, keepItAlways=False, uploadPath=N
     if ftp_config:
         return ftpUpload(src, file_name, ftp_config, upload_path)
     
-    if "mnt/NAS/mcn" in upload_path or "aigc_output/" in targetDomain:
-        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)
+    if upload_path:
+        if "mnt/NAS/mcn" in upload_path or "aigc_output/" in upload_path:
+            ftp_config = getFtpConfig("183.6.90.205")
+            return ftpUpload(src, file_name, ftp_config, upload_path)
+        elif (targetDomain != None and"aigc_output/" in targetDomain):
+            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)

{ryry_cli-4.20 → ryry_cli-4.22/ryry_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 4.20
+Version: 4.22
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen
@@ -23,7 +23,8 @@ Requires-Dist: gputil
 Requires-Dist: urlparser
 Requires-Dist: urllib3
 Requires-Dist: portalocker
-Requires-Dist: mecord-cli>=0.7.405
+Provides-Extra: with-mecord
+Requires-Dist: mecord-cli>=0.7.405; extra == "with-mecord"
 
 ryry Python Tool
 ===============================================

{ryry_cli-4.20 → ryry_cli-4.22}/ryry_cli.egg-info/requires.txt

@@ -10,4 +10,6 @@ gputil
 urlparser
 urllib3
 portalocker
+
+[with_mecord]
 mecord-cli>=0.7.405

{ryry_cli-4.20 → ryry_cli-4.22}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "4.20"
+ryry_version = "4.22"
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")
 try:
@@ -69,9 +69,11 @@ setuptools.setup(
         'gputil',
         'urlparser',
         'urllib3',
-        'portalocker',
-        'mecord-cli>=0.7.405',
+        'portalocker'
     ],
+    extras_require={
+        'with_mecord': ['mecord-cli>=0.7.405'],
+    },
     dependency_links=[],
     entry_points={
         'console_scripts':[