jpcli 0.4.0__py3-none-any.whl → 1.0.0__py3-none-any.whl

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/parsers/free_parser.py

@@ -2,21 +2,22 @@ import json
 
 
 def parse(command_output):
-    lines = command_output.strip().split('\n')
+    lines = command_output.strip().split("\n")
     headers = lines[0].split()
     memory_data = []
 
     for line in lines[1:]:
         values = line.split()
-        # Ensure that the length of headers and values are the same
+        category = values[0].strip(":")  # Extract "Mem" or "Swap"
+        values = values[1:]  # Remove category from values
+
+        # Ensure proper key-value matching
         if len(values) == len(headers):
             entry = {headers[i]: values[i] for i in range(len(headers))}
         else:
-            # Handle cases where the line might not match header length
-            entry = {}
-            for i in range(len(values)):
-                key = headers[i] if i < len(headers) else f'unknown_{i}'
-                entry[key] = values[i]
+            entry = {headers[i]: values[i] if i < len(values) else "N/A" for i in range(len(headers))}
+
+        entry["category"] = category  # Add category name separately
         memory_data.append(entry)
 
     return json.dumps(memory_data, indent=2)

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/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/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.4.0.dist-info → jpcli-1.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jpcli
-Version: 0.4.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
@@ -12,6 +12,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
+License-File: LICENCE
 
 # jpcli
 

{jpcli-0.4.0.dist-info → jpcli-1.0.0.dist-info}/RECORD

@@ -1,25 +1,27 @@
 jpcli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jpcli/main.py,sha256=yBIyZLm16x3sEI3iBw3uUHjFnJLzUd7evS1qN85M1HU,2610
+jpcli/main.py,sha256=XuBzcHR4d8OWjmncXEZFbCdPEjFmozXD3vl5bvzfb6E,2712
 jpcli/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jpcli/parsers/cmdline_parser.py,sha256=S8PZjDTkxyz2IAY3hBvHDekWRGCkj9MHiLi2haupUZM,562
 jpcli/parsers/cpuinfo_parser.py,sha256=aL6NZ-_O_wmGRdZSzm7SttCngWoW7eqWckubxPWFpJk,973
 jpcli/parsers/df_parser.py,sha256=E2s8c6i60iKrS4IcCv_L_Fu5vDE_xnOTklAk_PFM5T4,549
 jpcli/parsers/dmesg_parser.py,sha256=v4i7inWGRKycyDIvjTyGaSBIYQZf7tNTJ4lxKKvKSN4,397
-jpcli/parsers/free_parser.py,sha256=GJuJKCT4cIN4O5D-rHjalx-6FzDT6-lpUurmh9PnUKE,721
+jpcli/parsers/free_parser.py,sha256=fPKU3h_i420vOqefNtNpmBa5so3JCSdiauz6mF4Ra9c,748
 jpcli/parsers/ifconfig_parser.py,sha256=zEfTi8zdYnpQ4QNgZh1I31Z-mY9F1uAXGV9f6knJeJ0,1353
 jpcli/parsers/journalctl_parser.py,sha256=z9_6_8Gu798pQekosMCfoieCDGxbNcxOGcbteg4fzQk,949
+jpcli/parsers/lsblk_parser.py,sha256=eHHU9jpmL-wR1LVGx-nbtyV_vAi3D04Me0qy9m_DvEU,502
 jpcli/parsers/lscpu_parser.py,sha256=b_OzMysCshP2lXY2Vmc-MJlxlYXocNTOvr7DHUeWkvQ,661
-jpcli/parsers/lshw_parser.py,sha256=0zoSIvYax2Ut_cNxQ8krPMPmiUyaV9n4sOIkXjtMrCA,1623
+jpcli/parsers/lshw_parser.py,sha256=q3xw1IjIMQ2ubczcRYo_H-LxllfUO07CpKIhJaJ4K_k,1606
 jpcli/parsers/lsmem_parser.py,sha256=czWYUx6gwy2Z0nrLM5rJxBDz2HFQC9HSew2cenC-1vA,985
+jpcli/parsers/lsusb_parser.py,sha256=sbiv8pDMva2bNdxjkXRFrxrdVUS6EixrOOpTjIeyO9g,702
 jpcli/parsers/mcelog_parser.py,sha256=GLZlj_Yl1KAzuTFotosudWPBAi_VhkBGdeKUbjNFhuk,412
 jpcli/parsers/os_release_parser.py,sha256=XQetNqNxmjMMdQPgqKS9XLQIoa5T7DMAcOTJJ0gmhCo,352
 jpcli/parsers/uname_parser.py,sha256=Yx59k9JzzfNgKZ9pt3hhfSwk0o9Ow1kqQdQNWUF6asc,1040
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_lsmem_parser.py,sha256=mRlHTmU2ZmcxPGgcqAv_LNGs56yrwDBiw2-aHKrpuEo,793
 tests/test_other_command_parser.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jpcli-0.4.0.dist-info/LICENCE,sha256=-unHZSaIlcrVEVD56Ss5dlOvdgK682a2xitz35UlKt4,1069
-jpcli-0.4.0.dist-info/METADATA,sha256=3KfCVsK1e1wxOccgV0JAOhSVhXQqIL2CirEhh5JyIB0,603
-jpcli-0.4.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-jpcli-0.4.0.dist-info/entry_points.txt,sha256=6wCYs9scOVGFsZE-b2r2geNzy4uST0GgWyHmveiPSxE,43
-jpcli-0.4.0.dist-info/top_level.txt,sha256=djdbp8mEzCmAEbrMOVEHNW4LIabBwnpLURp2dX_ZQbA,12
-jpcli-0.4.0.dist-info/RECORD,,
+jpcli-1.0.0.dist-info/LICENCE,sha256=-unHZSaIlcrVEVD56Ss5dlOvdgK682a2xitz35UlKt4,1069
+jpcli-1.0.0.dist-info/METADATA,sha256=zkJNjA2mvvCrDX_QAVFAEclvEyrFq0jOnNuQ_BcZLZQ,625
+jpcli-1.0.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+jpcli-1.0.0.dist-info/entry_points.txt,sha256=6wCYs9scOVGFsZE-b2r2geNzy4uST0GgWyHmveiPSxE,43
+jpcli-1.0.0.dist-info/top_level.txt,sha256=djdbp8mEzCmAEbrMOVEHNW4LIabBwnpLURp2dX_ZQbA,12
+jpcli-1.0.0.dist-info/RECORD,,

{jpcli-0.4.0.dist-info → jpcli-1.0.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.44.0)
+Generator: bdist_wheel (0.37.1)
 Root-Is-Purelib: true
 Tag: py3-none-any