ryry-cli 2.31__tar.gz → 2.33__tar.gz

{ryry_cli-2.31 → ryry_cli-2.33}/PKG-INFO

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

ryry_cli-2.33/ryry/constant.py

@@ -0,0 +1,5 @@
+#!!!!! do not change this file !!!!!
+app_version="2.33"
+app_bulld_number=233
+app_bulld_anchor="Noh_2024-08-15 15:07:33.090092"
+app_name="ryry-cli"

{ryry_cli-2.31 → ryry_cli-2.33}/ryry/ryry_server_socket.py

@@ -56,7 +56,6 @@ class RyryTaskExecutor(Thread):
                 if data is None: 
                     break
                 try:
-                    print(f"======= get data = {data}")
                     taskUUID = data["taskUUID"]
                     domain = ""
                     params_tmp = json.loads(data["data"])

{ryry_cli-2.31 → ryry_cli-2.33}/ryry/task.py

@@ -52,6 +52,8 @@ def cmdWithWidget(widget_id):
 def cmdWithWidgetName(name):
     map = store.widgetMap()
     for widget_id in map.keys():
+        if "name" not in map[widget_id]:
+            continue
         if map[widget_id]["name"] == name and map[widget_id]["isBlock"] == False:
             is_block = map[widget_id]["isBlock"]
             return map[widget_id]["path"]
@@ -142,7 +144,7 @@ def updateProgress(data, progress=50, taskUUID=None):
         progress = 0
     if progress > 100:
         progress = 100
-    if realTaskUUID.startswith("local_") == False:
+    if realTaskUUID and realTaskUUID.startswith("local_") == False:
         return ryry_webapi.TaskUpdateProgress(realTaskUUID, progress, json.dumps(data))
 
 def timeout_killprocess(proc, timeout): # """超过指定的秒数后杀死进程"""

{ryry_cli-2.31 → ryry_cli-2.33}/ryry/upload.py

@@ -1,42 +1,5 @@
 from urllib.parse import *
 
-def addtionExif(srcFile, taskUUID):
-    if taskUUID == None or len(taskUUID) == 0:
-        return
-    try:
-        from pathlib import Path
-        file_name = Path(srcFile).name
-        ext = file_name[file_name.index("."):].lower()
-        if ext in [".jpg", ".png", ".jpeg", ".bmp", ".webp", ".gif"]:
-            from PIL import Image
-            img = Image.open(srcFile)
-            exif_dict = {
-                "0th": { }, 
-                "Exif": { }, 
-                "1st": { },
-                "thumbnail": None, 
-                "GPS": { }
-            }
-            import piexif
-            if taskUUID:
-                exif_dict["0th"] = { 
-                    piexif.ImageIFD.Software: f'make with ryry({taskUUID})'.encode(),
-                    piexif.ImageIFD.Copyright: f'dalipen'.encode(),
-                }
-                exif_dict["Exif"] = {
-                    piexif.ExifIFD.UserComment: f'make with ryry({taskUUID})'.encode(),
-                }
-            exif_dat = piexif.dump(exif_dict)
-            img.save(srcFile, "webp", quality=90, exif=exif_dat)
-        # elif ext in [".mp4",".mov",".avi",".wmv",".mpg",".mpeg",".rm",".ram",".flv",".swf",".ts"]:
-        #     params = {}
-        # elif ext in [".mp3",".aac",".wav",".wma",".cda",".flac",".m4a",".mid",".mka",".mp2",".mpa",".mpc",".ape",".ofr",".ogg",".ra",".wv",".tta",".ac3",".dts"]:
-        #     params = {}
-        # else:
-        #     params = {}
-    except:
-        return
-
 def transcode(srcFile):
     try:
         from pathlib import Path
@@ -80,13 +43,13 @@ def additionalUrl(srcFile, ossUrl):
     except:
         return ossUrl
 
-def upload(src, taskUUID, timeout=300, needTranscode=True):
+def upload(src, taskUUID=None, timeout=300, needTranscode=True):
     import os
     from pathlib import Path
     from ryry import taskUtils
     if os.path.exists(src) == False:
         raise Exception(f"upload file not found")
-    if taskUUID==None or len(taskUUID) <= 0:
+    if taskUUID == None or len(taskUUID) <= 0:
         taskUUID = taskUtils.taskInfoWithFirstTask()
     targetDomain = taskUtils.taskDomainWithUUID(taskUUID)
 
@@ -95,7 +58,6 @@ def upload(src, taskUUID, timeout=300, needTranscode=True):
     else:
         needDeleteSrc = False
         newSrc = src
-    addtionExif(newSrc, taskUUID)
     support_subdomain = getSubdomain(targetDomain)
     if support_subdomain:
         import uuid
@@ -133,7 +95,7 @@ def ftpUpload(file, new_file_name, subdomain):
     writepath = subdomain["writepath"]
     readpath = subdomain["readpath"]
     import ftplib
-    ftp = ftplib.FTP(ip)
+    ftp = ftplib.FTP(ip, timeout=3)
     ftp.login(username, password)
 
     s = deepFtpUpload(file, new_file_name, ftp, writepath, readpath)
@@ -143,7 +105,7 @@ def ftpUpload(file, new_file_name, subdomain):
 def _can_connect_ftp(ip, username, password, writepath):  
     import ftplib
     try:  
-        ftp = ftplib.FTP(ip)
+        ftp = ftplib.FTP(ip, timeout=3)
         ftp.login(username, password)
         try:
             ftp.cwd(writepath)
@@ -179,8 +141,9 @@ def getSubdomain(targetDomain):
     if len(targetDomain) <= 0:
         return None
     for ip in SUBDOMAIN.keys():
-        if _can_connect_ftp(ip, SUBDOMAIN[ip]["username"], SUBDOMAIN[ip]["password"], SUBDOMAIN[ip]["writepath"]) and targetDomain == SUBDOMAIN[ip]["readpath"]:
-            return SUBDOMAIN[ip]
+        if targetDomain == SUBDOMAIN[ip]["readpath"]:
+            if _can_connect_ftp(ip, SUBDOMAIN[ip]["username"], SUBDOMAIN[ip]["password"], SUBDOMAIN[ip]["writepath"]):
+                return SUBDOMAIN[ip]
     return None
 
 def getFirstSupportSubdomain():
@@ -210,7 +173,7 @@ def download(url, saveDir):
                 password = SUBDOMAIN[host]["password"]
                 writepath = SUBDOMAIN[host]["writepath"]
                 readpath = SUBDOMAIN[host]["readpath"]
-                ftp = ftplib.FTP(ip)  
+                ftp = ftplib.FTP(ip, timeout=3)  
                 ftp.login(username, password)  
             
                 remote_filepath = parsed_url.path[1:]

{ryry_cli-2.31 → ryry_cli-2.33}/ryry_cli.egg-info/PKG-INFO

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

{ryry_cli-2.31 → ryry_cli-2.33}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "2.31"
+ryry_version = "2.33"
 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.31/ryry/constant.py

@@ -1,5 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.31"
-app_bulld_number=231
-app_bulld_anchor="Noh_2024-08-14 19:48:56.982357"
-app_name="ryry-cli"