ryry-cli 2.11__tar.gz → 2.13__tar.gz

{ryry_cli-2.11/ryry_cli.egg-info → ryry_cli-2.13}/PKG-INFO

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

ryry_cli-2.13/ryry/constant.py

@@ -0,0 +1,5 @@
+#!!!!! do not change this file !!!!!
+app_version="2.13"
+app_bulld_number=213
+app_bulld_anchor="Noh_2024-06-14 14:07:27.352744"
+app_name="ryry-cli"

{ryry_cli-2.11 → ryry_cli-2.13}/ryry/main.py

@@ -22,7 +22,7 @@ def service_status(stdscr, idx):
         else:
             stdscr.addstr(*args)
     if platform.system() != 'Windows':
-        real_stdsrc(idx, 0, scr_str("Processing".ljust(ll)))
+        real_stdsrc(idx, 0, scr_str("Processing".ljust(ll*3-2)))
         idx+=1
     def running_task_uuids():
         lst = []
@@ -41,9 +41,9 @@ def service_status(stdscr, idx):
                 real_s = this_lst[this_d]
                 if len(append_str) > 0:
                     real_s += f" [{append_str}]"
-                real_stdsrc(row_idx, col_idx, scr_str(" " + real_s.ljust(ll-1)))
+                real_stdsrc(row_idx, col_idx, scr_str(" " + real_s.ljust(ll*2-1)))
             else:
-                real_stdsrc(row_idx, col_idx, scr_str(" " + " ".ljust(ll-1)))
+                real_stdsrc(row_idx, col_idx, scr_str(" " + " ".ljust(ll*2-1)))
         widget_stdscr(d, lst, idx, 0, "task" if platform.system() == 'Windows' else "")
         idx+=1
     return idx

{ryry_cli-2.11 → ryry_cli-2.13}/ryry/ryry_server_socket.py

@@ -4,7 +4,6 @@ import threading
 from datetime import datetime, timedelta
 import calendar
 from threading import Thread, current_thread, Lock
-import websocket
 import uuid
 import queue
 import subprocess, platform

{ryry_cli-2.11 → ryry_cli-2.13}/ryry/upload.py

@@ -80,7 +80,7 @@ def additionalUrl(srcFile, ossUrl):
     except:
         return ossUrl
 
-def upload(src, taskUUID, timeout=300):
+def upload(src, taskUUID, timeout=300, needTranscode=True):
     import os
     from ryry import store
     from pathlib import Path
@@ -92,7 +92,11 @@ def upload(src, taskUUID, timeout=300):
     if taskUUID==None or len(taskUUID) <= 0:
         taskUUID = taskUtils.taskInfoWithFirstTask()
 
-    needDeleteSrc, newSrc = transcode(src)
+    if needTranscode:
+        needDeleteSrc, newSrc = transcode(src)
+    else:
+        needDeleteSrc = False
+        newSrc = src
     addtionExif(newSrc, taskUUID)
     file_name = Path(newSrc).name
     ossurl = ryry_webapi.upload(newSrc, os.path.splitext(file_name)[-1][1:])

{ryry_cli-2.11 → ryry_cli-2.13/ryry_cli.egg-info}/PKG-INFO

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

{ryry_cli-2.11 → ryry_cli-2.13}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "2.11"
+ryry_version = "2.13"
 ryry_build_number = int(ryry_version.replace(".",""))
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")

ryry_cli-2.11/ryry/constant.py

@@ -1,5 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.11"
-app_bulld_number=211
-app_bulld_anchor="Noh_2024-06-12 18:33:13.934842"
-app_name="ryry-cli"