jpcli 0.5.0__tar.gz → 1.0.0__tar.gz

{jpcli-0.5.0/jpcli.egg-info → jpcli-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jpcli
-Version: 0.5.0
+Version: 1.0.0
 Summary: A library to convert Linux command output to JSON
 Home-page: https://github.com/JaimeAdanCuevas/jpcli
 Author: Jaime Cuevas

{jpcli-0.5.0 → jpcli-1.0.0}/jpcli/main.py

@@ -2,7 +2,7 @@
 import argparse
 import subprocess
 import sys
-from .parsers import lsmem_parser, free_parser, df_parser, lshw_parser, lscpu_parser, cpuinfo_parser, uname_parser, ifconfig_parser, cmdline_parser, os_release_parser, dmesg_parser, journalctl_parser, mcelog_parser
+from .parsers import lsmem_parser, free_parser, df_parser, lshw_parser, lscpu_parser, cpuinfo_parser, uname_parser, ifconfig_parser, cmdline_parser, os_release_parser, dmesg_parser, journalctl_parser, mcelog_parser, lsusb_parser, lsblk_parser
 
 
 def run_command(command):
@@ -29,6 +29,8 @@ def parse_command_output(command_output, parser_name):
         'dmesg': dmesg_parser.parse,
         'journalctl': journalctl_parser.parse,
         'mcelog': mcelog_parser.parse,
+        'lsusb': lsusb_parser.parse,
+        'lsblk': lsblk_parser.parse,
     }
     if parser_name in parsers:
         return parsers[parser_name](command_output)

jpcli-1.0.0/jpcli/parsers/lsblk_parser.py

@@ -0,0 +1,17 @@
+import json
+
+
+def parse(command_output):
+    lines = command_output.strip().split("\n")
+    if not lines:
+        return json.dumps([], indent=2)
+
+    headers = lines[0].split()
+    block_devices = []
+
+    for line in lines[1:]:
+        values = line.split(None, len(headers) - 1)  # Split only into len(headers) parts
+        entry = {headers[i]: values[i] if i < len(values) else "N/A" for i in range(len(headers))}
+        block_devices.append(entry)
+
+    return json.dumps(block_devices, indent=2)

{jpcli-0.5.0 → jpcli-1.0.0}/jpcli/parsers/lshw_parser.py

@@ -6,7 +6,7 @@ def parse(command_output, indent_level=0):
     Recursively parse sections of command output based on indentation level.
     """
     def parse_section(lines, indent_level):
-        data = {}
+
         current_section = {}  # Initialize as empty dictionary
         while lines:
             line = lines.pop(0)

jpcli-1.0.0/jpcli/parsers/lsusb_parser.py

@@ -0,0 +1,24 @@
+import json
+import re
+
+
+def parse(command_output):
+    lines = command_output.strip().split("\n")
+    usb_data = []
+
+    for line in lines:
+        # Regex to capture bus, device, ID, and description
+        match = re.match(r"Bus (\d+) Device (\d+): ID ([0-9a-fA-F]{4}:[0-9a-fA-F]{4}) (.+)", line)
+        if match:
+            entry = {
+                "bus": match.group(1),
+                "device": match.group(2),
+                "id": match.group(3),
+                "description": match.group(4)
+            }
+            usb_data.append(entry)
+        else:
+            # If line doesn't match, keep it raw
+            usb_data.append({"raw": line})
+
+    return json.dumps(usb_data, indent=2)

{jpcli-0.5.0 → jpcli-1.0.0/jpcli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jpcli
-Version: 0.5.0
+Version: 1.0.0
 Summary: A library to convert Linux command output to JSON
 Home-page: https://github.com/JaimeAdanCuevas/jpcli
 Author: Jaime Cuevas

{jpcli-0.5.0 → jpcli-1.0.0}/jpcli.egg-info/SOURCES.txt

@@ -17,9 +17,11 @@ jpcli/parsers/dmesg_parser.py
 jpcli/parsers/free_parser.py
 jpcli/parsers/ifconfig_parser.py
 jpcli/parsers/journalctl_parser.py
+jpcli/parsers/lsblk_parser.py
 jpcli/parsers/lscpu_parser.py
 jpcli/parsers/lshw_parser.py
 jpcli/parsers/lsmem_parser.py
+jpcli/parsers/lsusb_parser.py
 jpcli/parsers/mcelog_parser.py
 jpcli/parsers/os_release_parser.py
 jpcli/parsers/uname_parser.py

{jpcli-0.5.0 → jpcli-1.0.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name="jpcli",
-    version="0.5.0",
+    version="1.0.0",
     author="Jaime Cuevas",
     author_email="adancuevas@outlook.com",
     description="A library to convert Linux command output to JSON",