LinuxMonitor 1.3.8__tar.gz → 1.3.10__tar.gz

{linuxmonitor-1.3.8 → linuxmonitor-1.3.10/LinuxMonitor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LinuxMonitor
-Version: 1.3.8
+Version: 1.3.10
 Summary: Get information and warning status of Linux server like service, port, ping, ssl certificate, disk/folder/cpu/ram/swap usage, ip connection, ... (Python and shell library, Linux ONLY)
 Home-page: https://github.com/QuentinCG/Linux-Monitor-Python-Library
 Author: Quentin Comte-Gaz

{linuxmonitor-1.3.8/LinuxMonitor.egg-info → linuxmonitor-1.3.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LinuxMonitor
-Version: 1.3.8
+Version: 1.3.10
 Summary: Get information and warning status of Linux server like service, port, ping, ssl certificate, disk/folder/cpu/ram/swap usage, ip connection, ... (Python and shell library, Linux ONLY)
 Home-page: https://github.com/QuentinCG/Linux-Monitor-Python-Library
 Author: Quentin Comte-Gaz

{linuxmonitor-1.3.8 → linuxmonitor-1.3.10}/linuxmonitor/linuxmonitor.py

@@ -33,7 +33,7 @@ __email__ = "quentin@comte-gaz.com"
 __license__ = "MIT License"
 __copyright__ = "Copyright Quentin Comte-Gaz (2024)"
 __python_version__ = "3.+"
-__version__ = "1.3.8 (2024/09/19)"
+__version__ = "1.3.10 (2024/09/23)"
 __status__ = "Usable for any Linux project"
 
 import json
@@ -196,6 +196,9 @@ class LinuxMonitor:
         md: str = ""
         indent: str = "  " * level  # type: ignore # Indentation for markdown headings
 
+        # Preprocess the input to convert single quotes to double quotes
+        json_string = re.sub(r"'", '"', json_string)
+
         # Parse the JSON string to a Python object
         try:
             data = json.loads(json_string)
@@ -212,11 +215,13 @@ class LinuxMonitor:
                     md += f"{indent}- {key}\n"
                     process_data(value, level + 1) # type: ignore
             elif isinstance(data, list):
-                for index, item in enumerate(data): # type: ignore
-                    md += f"{indent}- Item {index + 1}\n"
-                    process_data(item, level + 1) # type: ignore
+                if not data:  # Show "nothing" for empty lists
+                    md += f"{indent}- Nothing\n"
+                else:
+                    for item in data: # type: ignore
+                        process_data(item, level)  # Skip "Item" label # type: ignore
             else:
-                md += f"{indent}  - {data}\n"
+                md += f"{indent}- {data}\n"
 
         process_data(data, level)
 
@@ -295,6 +300,15 @@ class LinuxMonitor:
             if not display_only_if_critical:
                 if not show_only_std_and_exception:
                     out_msg = f"  - ✅ **{display_name} executed successfully**"
+                else:
+                    if stdout_str != "":
+                        msg_stout: str = stdout_str
+                        if is_stdout_json:
+                            msg_stout = self._json_to_md(stdout_str)
+                        if msg_stout != "":
+                            if out_msg != "":
+                                out_msg += "\n"
+                            out_msg += f"```sh\n{msg_stout}\n```"
 
         if res == True:
             logging.info(msg=f"Command {display_name} (command {command}) executed successfully")
@@ -1873,14 +1887,16 @@ class LinuxMonitor:
                 logging.info(msg=out_msg)
 
                 if show_content_if_success:
-                    out_msg += f"\n{res_msg}"
+                    if res_msg != "":
+                        out_msg += f"\n{res_msg}"
 
             elif res == False:
                 out_msg = f"⚠️ **{display_name} failed to execute**."
                 logging.warning(msg=out_msg)
 
                 if show_content_if_issue:
-                    out_msg += f"\n{res_msg}"
+                    if res_msg != "":
+                        out_msg += f"\n{res_msg}"
 
             else:
                 out_msg = f"⚠️ **{display_name} expired**."

{linuxmonitor-1.3.8 → linuxmonitor-1.3.10}/setup.py

@@ -6,7 +6,7 @@ with io.open(file='README.md', mode='r', encoding='utf-8') as readme_file:
 
 setup(
     name="LinuxMonitor",
-    version="1.3.8",
+    version="1.3.10",
     description="Get information and warning status of Linux server like service, port, ping, ssl certificate, disk/folder/cpu/ram/swap usage, ip connection, ... (Python and shell library, Linux ONLY)",
     long_description=readme,
     long_description_content_type="text/markdown",