jpcli 0.1.1__py3-none-any.whl → 0.1.3__py3-none-any.whl

jpcli/main.py

@@ -23,12 +23,23 @@ def parse_command_output(command_output, parser_name):
 def main():
     parser = argparse.ArgumentParser(description='JP - JSON Parser for Linux commands')
     parser.add_argument('command', type=str, help='The Linux command to run')
-    parser.add_argument('parser_name', type=str, nargs='?', default='', help='The name of the parser to use')
+    parser.add_argument('parser_name', type=str, nargs='?', default=None, help='The name of the parser to use')
 
     args = parser.parse_args()
     result = jpcli(args.command, args.parser_name)
     print(result)
 
-def jpcli(command, parser_name):
-    output = run_command(command)
-    return parse_command_output(output, parser_name)
+def jpcli(command, parser_name=None):
+    result = subprocess.run(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
+    if result.returncode != 0:
+        print(f"Error: {result.stderr}", file=sys.stderr)
+        sys.exit(result.returncode)
+
+    command_output = result.stdout
+    if parser_name is None:
+        parser_name = command.split()[0]  # Use the first word of the command as the parser name
+    return parse_command_output(command_output, parser_name)
+
+if __name__ == '__main__':
+    main()
+

jpcli/parsers/lsmem_parser.py

@@ -1,11 +1,24 @@
 def parse(command_output):
-    lines = command_output.strip().splitlines()
-    headers = [header.strip() for header in lines[0].split()]
+    lines = command_output.splitlines()
     data = []
+    headers = []
 
-    for line in lines[1:]:
-        values = line.split()
-        entry = {headers[i]: values[i] for i in range(len(values))}
-        data.append(entry)
+    # Extract headers from the first line
+    if lines:
+        headers = [header.strip() for header in lines[0].split() if header.strip()]
+        lines = lines[1:]
+
+    for line in lines:
+        if not line.strip():  # Skip empty lines
+            continue
+
+        values = [value.strip() for value in line.split() if value.strip()]
+        if len(values) != len(headers):
+            # For handling lines with different formats (like summary lines)
+            data.append({headers[0]: " ".join(values)})
+        else:
+            entry = {headers[i]: values[i] for i in range(len(headers))}
+            data.append(entry)
 
     return data
+

{jpcli-0.1.1.dist-info → jpcli-0.1.3.dist-info}/METADATA

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

{jpcli-0.1.1.dist-info → jpcli-0.1.3.dist-info}/RECORD

@@ -1,15 +1,15 @@
 jpcli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jpcli/main.py,sha256=foB1DnJZQG6hhJs71okST_Sb5zW2dknRTyJPkYsUpU4,1238
+jpcli/main.py,sha256=yqnw53CJ6cBFtV6X1ujy3sfKGu9I3Tp9Rrrm1gcOauU,1653
 jpcli/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jpcli/parsers/free_parser.py,sha256=XymIi1eafmIElMMVxS3DmlZ-oC4dcYvKmNWDm5tCEEs,721
-jpcli/parsers/lsmem_parser.py,sha256=wlOInwE_gkrarxvRp-4_tk1zCbb3RDGHyLME56AR7Go,321
+jpcli/parsers/lsmem_parser.py,sha256=EFGZISeaH9esGOnj_lYX0_biZjKnWo23dtDY9-LZ42s,745
 jpcli/parsers/other_command_parser.py,sha256=G2so9nFluHiyuyEDJouxuN4FHkNheyIY_laDFXxE6xM,134
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_lsmem_parser.py,sha256=maT0mCSFyAHCMdRMl0NEa-FUE_2-MMDoYZS5W67PYZU,791
 tests/test_other_command_parser.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jpcli-0.1.1.dist-info/LICENCE,sha256=-unHZSaIlcrVEVD56Ss5dlOvdgK682a2xitz35UlKt4,1069
-jpcli-0.1.1.dist-info/METADATA,sha256=nbis0NNP6q8GhqNmtckScuiCKD8XHRr8HRYC6HcAG3s,625
-jpcli-0.1.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-jpcli-0.1.1.dist-info/entry_points.txt,sha256=6wCYs9scOVGFsZE-b2r2geNzy4uST0GgWyHmveiPSxE,43
-jpcli-0.1.1.dist-info/top_level.txt,sha256=djdbp8mEzCmAEbrMOVEHNW4LIabBwnpLURp2dX_ZQbA,12
-jpcli-0.1.1.dist-info/RECORD,,
+jpcli-0.1.3.dist-info/LICENCE,sha256=-unHZSaIlcrVEVD56Ss5dlOvdgK682a2xitz35UlKt4,1069
+jpcli-0.1.3.dist-info/METADATA,sha256=UKRlNwr6g41gzrQT1zw2xNbiVun-CZ0NU-uoyAhu--w,625
+jpcli-0.1.3.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+jpcli-0.1.3.dist-info/entry_points.txt,sha256=6wCYs9scOVGFsZE-b2r2geNzy4uST0GgWyHmveiPSxE,43
+jpcli-0.1.3.dist-info/top_level.txt,sha256=djdbp8mEzCmAEbrMOVEHNW4LIabBwnpLURp2dX_ZQbA,12
+jpcli-0.1.3.dist-info/RECORD,,