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

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

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

ryry_cli-2.34/ryry/constant.py

@@ -0,0 +1,5 @@
+#!!!!! do not change this file !!!!!
+app_version="2.34"
+app_bulld_number=234
+app_bulld_anchor="Noh_2024-08-15 15:44:25.637142"
+app_name="ryry-cli"

{ryry_cli-2.32 → ryry_cli-2.34}/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"])
@@ -85,10 +84,8 @@ class RyryTaskExecutor(Thread):
         print(f"   {current_thread().name} taskRunning stop")
 
     def run(self):
-        idx = 1
-        for _ in range(0, self.max_counter):
+        for idx in range(0, self.max_counter):
             self.THEADING_LIST.append(Thread(name=f"exector-{idx}",target=self.taskRunning))
-            idx+=1
         for t in self.THEADING_LIST:
             t.start()
         while self.is_running:
@@ -181,6 +178,9 @@ class RyryShortConnectThread(Thread):
         
         while (self.is_running):
             try:
+                if self.executor.idlePower() == 0:
+                    time.sleep(1)
+                    continue
                 datas = ryry_webapi.GetTask()
                 for it in datas:
                     self.executor.appendTask(it, self.taskCallback)

{ryry_cli-2.32 → ryry_cli-2.34}/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.32 → ryry_cli-2.34}/ryry/upload.py

@@ -95,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)
@@ -105,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)
@@ -141,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():
@@ -172,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.32 → ryry_cli-2.34}/ryry_cli.egg-info/PKG-INFO

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

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

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

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