ryry-cli 4.5__tar.gz → 4.6__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (31) hide show
  1. {ryry_cli-4.5/ryry_cli.egg-info → ryry_cli-4.6}/PKG-INFO +1 -1
  2. {ryry_cli-4.5 → ryry_cli-4.6}/ryry/constant.py +2 -2
  3. {ryry_cli-4.5 → ryry_cli-4.6}/ryry/upload.py +6 -0
  4. {ryry_cli-4.5 → ryry_cli-4.6/ryry_cli.egg-info}/PKG-INFO +1 -1
  5. {ryry_cli-4.5 → ryry_cli-4.6}/setup.py +1 -1
  6. {ryry_cli-4.5 → ryry_cli-4.6}/LICENSE +0 -0
  7. {ryry_cli-4.5 → ryry_cli-4.6}/README.md +0 -0
  8. {ryry_cli-4.5 → ryry_cli-4.6}/ryry/__init__.py +0 -0
  9. {ryry_cli-4.5 → ryry_cli-4.6}/ryry/daemon_base.py +0 -0
  10. {ryry_cli-4.5 → ryry_cli-4.6}/ryry/daemon_manager.py +0 -0
  11. {ryry_cli-4.5 → ryry_cli-4.6}/ryry/main.py +0 -0
  12. {ryry_cli-4.5 → ryry_cli-4.6}/ryry/ryry_server_socket.py +0 -0
  13. {ryry_cli-4.5 → ryry_cli-4.6}/ryry/ryry_service.py +0 -0
  14. {ryry_cli-4.5 → ryry_cli-4.6}/ryry/ryry_webapi.py +0 -0
  15. {ryry_cli-4.5 → ryry_cli-4.6}/ryry/ryry_widget.py +0 -0
  16. {ryry_cli-4.5 → ryry_cli-4.6}/ryry/script_template/__init__.py +0 -0
  17. {ryry_cli-4.5 → ryry_cli-4.6}/ryry/script_template/daemon.py +0 -0
  18. {ryry_cli-4.5 → ryry_cli-4.6}/ryry/script_template/main.py +0 -0
  19. {ryry_cli-4.5 → ryry_cli-4.6}/ryry/script_template/run.py +0 -0
  20. {ryry_cli-4.5 → ryry_cli-4.6}/ryry/server_func.py +0 -0
  21. {ryry_cli-4.5 → ryry_cli-4.6}/ryry/shared_memory.py +0 -0
  22. {ryry_cli-4.5 → ryry_cli-4.6}/ryry/store.py +0 -0
  23. {ryry_cli-4.5 → ryry_cli-4.6}/ryry/task.py +0 -0
  24. {ryry_cli-4.5 → ryry_cli-4.6}/ryry/taskUtils.py +0 -0
  25. {ryry_cli-4.5 → ryry_cli-4.6}/ryry/utils.py +0 -0
  26. {ryry_cli-4.5 → ryry_cli-4.6}/ryry_cli.egg-info/SOURCES.txt +0 -0
  27. {ryry_cli-4.5 → ryry_cli-4.6}/ryry_cli.egg-info/dependency_links.txt +0 -0
  28. {ryry_cli-4.5 → ryry_cli-4.6}/ryry_cli.egg-info/entry_points.txt +0 -0
  29. {ryry_cli-4.5 → ryry_cli-4.6}/ryry_cli.egg-info/requires.txt +0 -0
  30. {ryry_cli-4.5 → ryry_cli-4.6}/ryry_cli.egg-info/top_level.txt +0 -0
  31. {ryry_cli-4.5 → ryry_cli-4.6}/setup.cfg +0 -0
{ryry_cli-4.5/ryry_cli.egg-info → ryry_cli-4.6}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: ryry-cli
3
- Version: 4.5
3
+ Version: 4.6
4
4
  Summary: ryry tools
5
5
  Home-page: https://github.com/dalipenMedia
6
6
  Author: dalipen
{ryry_cli-4.5 → ryry_cli-4.6}/ryry/constant.py RENAMED
@@ -1,6 +1,6 @@
1
1
  #!!!!! do not change this file !!!!!
2
- app_version="4.5"
3
- app_bulld_anchor="Noh_2025-07-18 15:37:11.722431"
2
+ app_version="4.6"
3
+ app_bulld_anchor="Noh_2025-07-18 16:44:49.443230"
4
4
  app_name="ryry-cli"
5
5
  import sys, os
6
6
  if getattr(sys, 'frozen', False):
{ryry_cli-4.5 → ryry_cli-4.6}/ryry/upload.py RENAMED
@@ -101,6 +101,10 @@ def uploadByDomain(src, targetDomain, taskUUID, keepItAlways=False, uploadPath=N
101
101
  if ftp_config:
102
102
  return ftpUpload(src, f"{new_file_name}.{ext}", ftp_config, upload_path)
103
103
 
104
+ if "mnt/NAS/mcn" in upload_path:
105
+ ftp_config = getFtpConfig("183.6.90.205")
106
+ return ftpUpload(src, f"{new_file_name}.{ext}", ftp_config, upload_path)
107
+
104
108
  from ryry import ryry_webapi
105
109
  return ryry_webapi.upload(src, ext, keepItAlways)
106
110
 
@@ -192,6 +196,8 @@ def ftpUpload(file, new_file_name, subdomain, upload_path=""):
192
196
  ftp.login(username, password)
193
197
 
194
198
  if upload_path:
199
+ if upload_path[0:1] == "/":
200
+ upload_path = upload_path[1:]
195
201
  s = deepFtpUpload(file, new_file_name, ftp, upload_path, f'ftp://{ip}/{upload_path}')
196
202
  else:
197
203
  s = deepFtpUpload(file, new_file_name, ftp, writepath, readpath)
{ryry_cli-4.5 → ryry_cli-4.6/ryry_cli.egg-info}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: ryry-cli
3
- Version: 4.5
3
+ Version: 4.6
4
4
  Summary: ryry tools
5
5
  Home-page: https://github.com/dalipenMedia
6
6
  Author: dalipen
{ryry_cli-4.5 → ryry_cli-4.6}/setup.py RENAMED
@@ -3,7 +3,7 @@ import os
3
3
  import subprocess
4
4
  import datetime
5
5
 
6
- ryry_version = "4.5"
6
+ ryry_version = "4.6"
7
7
  cur_dir = os.path.dirname(os.path.abspath(__file__))
8
8
  constanspy = os.path.join(cur_dir, "ryry", "constant.py")
9
9
  try:
{ryry_cli-4.5 → ryry_cli-4.6}/LICENSE RENAMED
File without changes
{ryry_cli-4.5 → ryry_cli-4.6}/README.md RENAMED
File without changes
{ryry_cli-4.5 → ryry_cli-4.6}/ryry/__init__.py RENAMED
File without changes
{ryry_cli-4.5 → ryry_cli-4.6}/ryry/daemon_base.py RENAMED
File without changes
{ryry_cli-4.5 → ryry_cli-4.6}/ryry/daemon_manager.py RENAMED
File without changes
{ryry_cli-4.5 → ryry_cli-4.6}/ryry/main.py RENAMED
File without changes
{ryry_cli-4.5 → ryry_cli-4.6}/ryry/ryry_service.py RENAMED
File without changes
{ryry_cli-4.5 → ryry_cli-4.6}/ryry/ryry_webapi.py RENAMED
File without changes
{ryry_cli-4.5 → ryry_cli-4.6}/ryry/ryry_widget.py RENAMED
File without changes
{ryry_cli-4.5 → ryry_cli-4.6}/ryry/server_func.py RENAMED
File without changes
{ryry_cli-4.5 → ryry_cli-4.6}/ryry/shared_memory.py RENAMED
File without changes
{ryry_cli-4.5 → ryry_cli-4.6}/ryry/store.py RENAMED
File without changes
{ryry_cli-4.5 → ryry_cli-4.6}/ryry/task.py RENAMED
File without changes
{ryry_cli-4.5 → ryry_cli-4.6}/ryry/taskUtils.py RENAMED
File without changes
{ryry_cli-4.5 → ryry_cli-4.6}/ryry/utils.py RENAMED
File without changes
{ryry_cli-4.5 → ryry_cli-4.6}/setup.cfg RENAMED
File without changes