ryry-cli 2.30__tar.gz → 2.32__tar.gz

{ryry_cli-2.30 → ryry_cli-2.32}/PKG-INFO

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

ryry_cli-2.32/ryry/constant.py

@@ -0,0 +1,5 @@
+#!!!!! do not change this file !!!!!
+app_version="2.32"
+app_bulld_number=232
+app_bulld_anchor="Noh_2024-08-14 20:58:15.921220"
+app_name="ryry-cli"

{ryry_cli-2.30 → ryry_cli-2.32}/ryry/ryry_service.py

@@ -158,27 +158,27 @@ class ryryPackageThread(Thread):
                 except Exception as ex:
                     print(f'update widget fail, {ex}')
 
-                if platform.system() != 'Darwin':
-                    try:
-                        #update cli
-                        remote_version = ryry_widget._remote_package_version("ryry-cli")
-                        simple = "https://pypi.python.org/simple/"
-                        local_version = ryry_widget._local_package_version("ryry-cli")
-                        if ryry_widget.compare_versions(remote_version, local_version) > 0:
-                            print("start update progress...")
-                            utils.begin_restart("auto upgrade ryry-cli", True, simple)
-                            device_id = utils.generate_unique_id()
-                            machine_name = socket.gethostname()
-                            ver = get_distribution("ryry-cli").version
-                            taskUtils.notifyWechatRobot({
-                                "msgtype": "text",
-                                "text": {
-                                    "content": f"机器<{machine_name}[{device_id}]>[{ver}] ryry-cli开始升级[{local_version}]->[{remote_version}]"
-                                }
-                            })
-                            break
-                    except Exception as ex:
-                        print(f'update ryry-cli fail, {ex}')
+                # if platform.system() != 'Darwin':
+                #     try:
+                #         #update cli
+                #         remote_version = ryry_widget._remote_package_version("ryry-cli")
+                #         simple = "https://pypi.python.org/simple/"
+                #         local_version = ryry_widget._local_package_version("ryry-cli")
+                #         if ryry_widget.compare_versions(remote_version, local_version) > 0:
+                #             print("start update progress...")
+                #             utils.begin_restart("auto upgrade ryry-cli", True, simple)
+                #             device_id = utils.generate_unique_id()
+                #             machine_name = socket.gethostname()
+                #             ver = get_distribution("ryry-cli").version
+                #             taskUtils.notifyWechatRobot({
+                #                 "msgtype": "text",
+                #                 "text": {
+                #                     "content": f"机器<{machine_name}[{device_id}]>[{ver}] ryry-cli开始升级[{local_version}]->[{remote_version}]"
+                #                 }
+                #             })
+                #             break
+                #     except Exception as ex:
+                #         print(f'update ryry-cli fail, {ex}')
             time.sleep(10)
         print(f"   PackageChecker stop")
         notify_other_stoped() #because other thread is waiting some signal to close

{ryry_cli-2.30 → ryry_cli-2.32}/ryry/ryry_widget.py

@@ -174,7 +174,9 @@ def addWidgetToEnv(root, mute=False):
         return
     data = GetWidgetConfig(root)
     widget_id = data["widget_id"]
-    name = data["name"]
+    name = ""
+    if "name" in data:
+        name = data["name"]
     mainPythonPath = os.path.join(root, "main.py")
     store.insertWidget(widget_id, name, mainPythonPath)
     if mute == False:

{ryry_cli-2.30 → ryry_cli-2.32}/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

{ryry_cli-2.30 → ryry_cli-2.32}/ryry_cli.egg-info/PKG-INFO

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

{ryry_cli-2.30 → ryry_cli-2.32}/setup.py

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

@@ -1,5 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.30"
-app_bulld_number=230
-app_bulld_anchor="Noh_2024-08-14 19:08:24.046492"
-app_name="ryry-cli"