ryry-cli 2.0__tar.gz → 2.1__tar.gz

{ryry_cli-2.0/ryry_cli.egg-info → ryry_cli-2.1}/PKG-INFO

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

ryry_cli-2.1/ryry/constant.py

@@ -0,0 +1,5 @@
+#!!!!! do not change this file !!!!!
+app_version="2.1"
+app_bulld_number=21
+app_bulld_anchor="Noh_2024-05-24 16:29:00.913157"
+app_name="ryry-cli"

{ryry_cli-2.0 → ryry_cli-2.1}/ryry/ryry_widget.py

@@ -115,7 +115,7 @@ def setWidgetData(root, widgetid):
     data = GetWidgetConfig(root)
     data["widget_id"] = widgetid
     data["name"] = "Demo"
-    data["version"] = "2.0"
+    data["version"] = "2.1"
     data["device_keys"] = [
         utils.generate_unique_id()
     ]
@@ -159,7 +159,7 @@ def addWidgetToEnv(root, mute=False):
         local_version = package.version
         name = package.project_name
         version = package.version
-        root = os.path.join(package.location, name)
+        root = os.path.join(package.location, name.replace("-", "_"))
     except:
         pass
 
@@ -242,7 +242,7 @@ def publishWidget(package_folder):
     if os.path.exists(pip_dir):
         shutil.rmtree(pip_dir)
     os.makedirs(pip_dir)
-    source_folder_name = name
+    source_folder_name = _pypi_folder_name(name)
     pip_source_dir = os.path.join(pip_dir, source_folder_name)
     shutil.copytree(package_folder, pip_source_dir)
     config_json_file = os.path.join(pip_source_dir, "config.json") 

{ryry_cli-2.0 → ryry_cli-2.1}/ryry/server_func.py

@@ -28,7 +28,7 @@ class TaskThread(Thread):
             checkUUID = ryry_webapi.createTask(self.widgetid, self.params)
             checking = True
             checkCount = 0
-            while checking or checkCount > 6000:
+            while checking or checkCount > 600:
                 finish, success, data = ryry_webapi.checkTask(checkUUID)
                 if finish:
                     checking = False
@@ -36,7 +36,7 @@ class TaskThread(Thread):
                         self.call_back(self.idx, data)
                         return
                 checkCount += 1
-                time.sleep(0.1)
+                time.sleep(1)
         else:
             print(f"widget {self.func}-{self.widgetid} not found")
         self.call_back(self.idx, None)

{ryry_cli-2.0 → ryry_cli-2.1/ryry_cli.egg-info}/PKG-INFO

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

{ryry_cli-2.0 → ryry_cli-2.1}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "2.0"
+ryry_version = "2.1"
 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")
@@ -24,7 +24,7 @@ app_name="ryry-cli"
 except:
     with open(constanspy, 'w') as f:
         f.write(f'''#!!!!! do not change this file !!!!!
-app_version="2.0"
+app_version="2.1"
 app_bulld_number=1
 app_bulld_anchor=""
 app_name="ryry-cli"

ryry_cli-2.0/ryry/constant.py

@@ -1,5 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.0"
-app_bulld_number=20
-app_bulld_anchor="Noh_2024-05-24 16:20:40.062991"
-app_name="ryry-cli"