ryry-cli 2.74__tar.gz → 2.76__tar.gz

{ryry_cli-2.74 → ryry_cli-2.76}/PKG-INFO

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

ryry_cli-2.76/ryry/constant.py

@@ -0,0 +1,4 @@
+#!!!!! do not change this file !!!!!
+app_version="2.76"
+app_bulld_anchor="Noh_2024-12-11 12:35:07.294947"
+app_name="ryry-cli"

{ryry_cli-2.74 → ryry_cli-2.76}/ryry/taskUtils.py

@@ -240,38 +240,41 @@ def notifyCounterIfNeed():
             }
         })
         
-        try:
-            import matplotlib.pyplot as plt
-            plt.figure(figsize=(8,3))
-            plt.rcParams.update({
-                'font.size': 7
-            })
-            plt.bar(t_l, s_l, color='g', label='success')
-            plt.bar(t_l, f_l, bottom=s_l, color='r', label='fail')
-            plt.title(f'[{socket.gethostname()}] [{yesterday}] success/fail={s_cnt}/{f_cnt}')
-            plt.xlabel('time')
-            plt.xticks(ticks=t_l,rotation=45)
-            plt.ylabel('count')
-            plt.subplots_adjust(bottom=0.25)
-            plt.legend()
-            fff = os.path.join(os.path.dirname(os.path.abspath(__file__)), "plt.png")
-            plt.savefig(fff)
-            with open(fff, "rb") as f:
-                encode_string = str(base64.b64encode(f.read()), encoding='utf-8')
-            md5 = hashlib.md5()
-            md5.update(base64.b64decode(encode_string))
-            hash = md5.hexdigest()
-            notifyWechatRobot({
-                "msgtype": "image",
-                "image": {
-                    "base64": encode_string,
-                    "md5": hash
-                }
-            })
-            os.remove(fff)
-            os.remove(task_counter_file)
-        except:
-            pass
+        import subprocess, platform
+        #darwin Command Line cannot create pyplot gui because not application with gui
+        if platform.system() != 'Darwin':
+            try:
+                import matplotlib.pyplot as plt
+                plt.figure(figsize=(8,3))
+                plt.rcParams.update({
+                    'font.size': 7
+                })
+                plt.bar(t_l, s_l, color='g', label='success')
+                plt.bar(t_l, f_l, bottom=s_l, color='r', label='fail')
+                plt.title(f'[{socket.gethostname()}] [{yesterday}] success/fail={s_cnt}/{f_cnt}')
+                plt.xlabel('time')
+                plt.xticks(ticks=t_l,rotation=45)
+                plt.ylabel('count')
+                plt.subplots_adjust(bottom=0.25)
+                plt.legend()
+                fff = os.path.join(os.path.dirname(os.path.abspath(__file__)), "plt.png")
+                plt.savefig(fff)
+                with open(fff, "rb") as f:
+                    encode_string = str(base64.b64encode(f.read()), encoding='utf-8')
+                md5 = hashlib.md5()
+                md5.update(base64.b64decode(encode_string))
+                hash = md5.hexdigest()
+                notifyWechatRobot({
+                    "msgtype": "image",
+                    "image": {
+                        "base64": encode_string,
+                        "md5": hash
+                    }
+                })
+                os.remove(fff)
+                os.remove(task_counter_file)
+            except:
+                pass
 
 def saveCounter(taskUUID, duration, isSuccess):
     try:

{ryry_cli-2.74 → ryry_cli-2.76}/ryry/upload.py

@@ -155,14 +155,14 @@ def getSubdomain(targetDomain):
     for ip in SUBDOMAIN.keys():
         for host_item in SUBDOMAIN[ip]:
             if targetDomain == host_item["readpath"]:
-                if _can_connect_ftp(ip, host_item["username"], host_item["port"], host_item["password"], host_item["writepath"]):
+                if _can_connect_ftp(ip, host_item["port"], host_item["username"], host_item["password"], host_item["writepath"]):
                     return host_item
     return None
 
 def getFirstSupportSubdomain():
     for ip in SUBDOMAIN.keys():
         for host_item in SUBDOMAIN[ip]:
-            if _can_connect_ftp(ip, host_item["username"], host_item["port"], host_item["password"], host_item["writepath"]):
+            if _can_connect_ftp(ip, host_item["port"], host_item["username"], host_item["password"], host_item["writepath"]):
                 return host_item
     return None
 

{ryry_cli-2.74 → ryry_cli-2.76}/ryry_cli.egg-info/PKG-INFO

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

{ryry_cli-2.74 → ryry_cli-2.76}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "2.74"
+ryry_version = "2.76"
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")
 try:

ryry_cli-2.74/ryry/constant.py

@@ -1,4 +0,0 @@
-#!!!!! do not change this file !!!!!
-app_version="2.74"
-app_bulld_anchor="Noh_2024-11-28 22:09:48.575754"
-app_name="ryry-cli"