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

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

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

{ryry_cli-4.13 → ryry_cli-4.14}/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.14"
+app_bulld_anchor="Noh_2025-07-22 14:21:58.369577"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

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

@@ -155,11 +155,14 @@ 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":
+                _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.13 → ryry_cli-4.14}/ryry/upload.py

@@ -191,7 +191,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 +214,7 @@ 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}')
+                        s = deepFtpUpload(file, new_file_name, ftp, upload_path, f'ftp://{ip}/mnt/NAS/mcn')
                     else:
                         s = deepFtpUpload(file, new_file_name, ftp, writepath, readpath)
                     
@@ -228,7 +228,7 @@ 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}')
+                s = deepFtpUpload(file, new_file_name, ftp, upload_path, f'ftp://{ip}/mnt/NAS/mcn')
             else:
                 s = deepFtpUpload(file, new_file_name, ftp, writepath, readpath)
             
@@ -263,16 +263,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.14/ryry_cli.egg-info}/PKG-INFO

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

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

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