ryry-cli 4.10__tar.gz → 4.12__tar.gz

{ryry_cli-4.10/ryry_cli.egg-info → ryry_cli-4.12}/PKG-INFO

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

{ryry_cli-4.10 → ryry_cli-4.12}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="4.10"
-app_bulld_anchor="Noh_2025-07-21 14:09:00.552333"
+app_version="4.12"
+app_bulld_anchor="Noh_2025-07-21 15:09:23.991341"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-4.10 → ryry_cli-4.12}/ryry/ryry_server_socket.py

@@ -235,7 +235,7 @@ class RyryShortConnectThread(Thread):
         
         while (self.is_running):
             try:
-                if self.executor.idlePower() == 0:
+                if self.executor.idlePower() <= 0:
                     time.sleep(1)
                     continue
                 

{ryry_cli-4.10 → ryry_cli-4.12}/ryry/shared_memory.py

@@ -541,24 +541,30 @@ class SharedMemoryService:
     def get_max_counter(self) -> int:
         """获取最大计数器（只读操作）"""
         data = self._read_data()
-        return data.get("max_counter", 1)
+        max_counter = data.get("max_counter", 1)
+        print(f"get_max_counter = {max_counter}")
+        return max_counter
     
     def set_cur_counter(self, cur_counter: int):
         """设置当前计数器"""
         def operation(data):
             data["cur_counter"] = cur_counter
+            print(f"set_cur_counter = {cur_counter}")
             return cur_counter
         return self._atomic_operation(operation)
     
     def get_cur_counter(self) -> int:
         """获取当前计数器（只读操作）"""
         data = self._read_data()
-        return data.get("cur_counter", 0)
+        cur_counter = data.get("cur_counter", 0)
+        print(f"get_cur_counter = {cur_counter}")
+        return cur_counter
     
     def increment_cur_counter(self) -> int:
         """增加当前计数器"""
         def operation(data):
             data["cur_counter"] = data.get("cur_counter", 0) + 1
+            print(f"increment_cur_counter")
             return data["cur_counter"]
         return self._atomic_operation(operation)
     
@@ -566,6 +572,7 @@ class SharedMemoryService:
         """减少当前计数器"""
         def operation(data):
             data["cur_counter"] = max(0, data.get("cur_counter", 0) - 1)
+            print(f"decrement_cur_counter")
             return data["cur_counter"]
         return self._atomic_operation(operation)
     

{ryry_cli-4.10 → ryry_cli-4.12}/ryry/upload.py

@@ -1,4 +1,5 @@
 from urllib.parse import *
+import time
 
 def transcode(srcFile):
     try:
@@ -71,10 +72,10 @@ def upload(src, taskUUID=None, needTranscode=False, keepItAlways=False, addition
             uploadPath = os.path.join('/mnt/NAS/mcn/', uploadPath)
         
 
+    needDeleteSrc = False
     if needTranscode:
         needDeleteSrc, newSrc = transcode(src)
     else:
-        needDeleteSrc = False
         newSrc = src
     
     # 根据targetDomain判断使用不同的上传逻辑
@@ -182,7 +183,6 @@ def uploadToOss(file, new_file_name, oss_config, upload_path=""):
         raise Exception(f"OSS upload failed: {response.status_code}")
 
 def deepFtpUpload(file, new_file_name, ftp, writepath, readpath):
-    import ftplib, os
     try:
         safe_cwd(ftp, writepath)
     except:
@@ -200,20 +200,45 @@ def ftpUpload(file, new_file_name, subdomain, upload_path=""):
     password = subdomain["password"]
     writepath = subdomain["writepath"]
     readpath = subdomain["readpath"]
+    retry = 0
     import ftplib
-    ftp = ftplib.FTP()
-    ftp.connect(ip, port, timeout=5)
-    ftp.login(username, password)  
+    while retry < 3:
+        try:
+            if retry > 0:
+                has_bak = FTP_REPLACEMENT.get(ip, None)
+                if has_bak:
+                    bak_config = DOMAIN_CONFIG.get(has_bak, None)["config"]
+                    ftp = ftplib.FTP()
+                    ftp.connect(bak_config["host"], bak_config["port"], timeout=5)
+                    ftp.login(bak_config["username"], bak_config["password"])  
+                    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}')
+                    else:
+                        s = deepFtpUpload(file, new_file_name, ftp, writepath, readpath)
+                    
+                    ftp.quit()
+                    return s
 
-    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}')
-    else:
-        s = deepFtpUpload(file, new_file_name, ftp, writepath, readpath)
-    
-    ftp.quit()
-    return s
+            ftp = ftplib.FTP()
+            ftp.connect(ip, port, timeout=5)
+            ftp.login(username, password)  
+
+            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}')
+            else:
+                s = deepFtpUpload(file, new_file_name, ftp, writepath, readpath)
+            
+            ftp.quit()
+            return s
+        except:
+            time.sleep(5)
+        finally:
+            retry+=1
+    raise Exception("uplad fail!")
     
 def _can_connect_ftp(ip, port, username, password, writepath):  
     import ftplib
@@ -299,6 +324,11 @@ DOMAIN_CONFIG = {
     "*.mecordai.com": {"type": "mecord-cli", "config": {}},
 }
 
+FTP_REPLACEMENT = {
+    "192.168.50.12": "183.6.90.205",
+    "183.6.90.205": "192.168.50.12",
+}
+
 SUBDOMAIN = {
     "183.6.90.205": [
         ftp_192_168_50_12,

{ryry_cli-4.10 → ryry_cli-4.12/ryry_cli.egg-info}/PKG-INFO

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

{ryry_cli-4.10 → ryry_cli-4.12}/setup.py

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