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

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

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

ryry_cli-2.31/ryry/constant.py

@@ -0,0 +1,5 @@
+#!!!!! 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"

{ryry_cli-2.29 → ryry_cli-2.31}/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.29 → ryry_cli-2.31}/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.29 → ryry_cli-2.31}/ryry/server_func.py

@@ -43,14 +43,14 @@ class TaskThread(Thread):
         if len(self.func) > 0:
             cmd = task.cmdWithWidgetName(self.func)
             if cmd:
-                print("======")
-                executeSuccess, result_obj = task.executeLocalPython("local_" + ''.join(str(uuid.uuid4()).split('-')), cmd, self.params)
-                print(result_obj)
+                self.checkUUID = "local_" + ''.join(str(uuid.uuid4()).split('-'))
+                self.params["task_id"] = self.checkUUID
+                executeSuccess, result_obj = task.executeLocalPython(self.checkUUID, cmd, self.params)
+                print("结束 " + result_obj)
                 if executeSuccess and result_obj["status"] == 0:
                     self.call_back(self.idx, result_obj["result"])
                 return
             else:
-                print("=====123123123=")
                 # run_server
                 self.checkUUID = ryry_webapi.createTask(self.func, self.params)
                 print("")

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

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

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

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

@@ -1,5 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.29"
-app_bulld_number=229
-app_bulld_anchor="Noh_2024-08-14 18:08:47.761550"
-app_name="ryry-cli"