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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jpcli
-Version: 0.4.0
+Version: 0.5.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-0.5.0.dist-info}/RECORD

@@ -5,7 +5,7 @@ jpcli/parsers/cmdline_parser.py,sha256=S8PZjDTkxyz2IAY3hBvHDekWRGCkj9MHiLi2haupU
 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/lscpu_parser.py,sha256=b_OzMysCshP2lXY2Vmc-MJlxlYXocNTOvr7DHUeWkvQ,661
@@ -17,9 +17,9 @@ jpcli/parsers/uname_parser.py,sha256=Yx59k9JzzfNgKZ9pt3hhfSwk0o9Ow1kqQdQNWUF6asc
 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-0.5.0.dist-info/LICENCE,sha256=-unHZSaIlcrVEVD56Ss5dlOvdgK682a2xitz35UlKt4,1069
+jpcli-0.5.0.dist-info/METADATA,sha256=lX6bauMKqK2faKxNpJ11XDWT0A8HjzveaLtjqJvsRbY,625
+jpcli-0.5.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+jpcli-0.5.0.dist-info/entry_points.txt,sha256=6wCYs9scOVGFsZE-b2r2geNzy4uST0GgWyHmveiPSxE,43
+jpcli-0.5.0.dist-info/top_level.txt,sha256=djdbp8mEzCmAEbrMOVEHNW4LIabBwnpLURp2dX_ZQbA,12
+jpcli-0.5.0.dist-info/RECORD,,

{jpcli-0.4.0.dist-info → jpcli-0.5.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