json-repair 0.29.0__py3-none-any.whl → 0.29.2__py3-none-any.whl

json_repair/json_repair.py

@@ -384,38 +384,39 @@ class JSONParser:
         # * If we are fixing missing quotes in an object, when it finds the special terminators
         char = self.get_char_at()
         while char and char != rstring_delimiter:
-            if missing_quotes:
-                if self.get_context() == "object_key" and (
-                    char == ":" or char.isspace()
-                ):
+            if (
+                missing_quotes
+                and self.get_context() == "object_key"
+                and (char == ":" or char.isspace())
+            ):
+                self.log(
+                    "While parsing a string missing the left delimiter in object key context, we found a :, stopping here",
+                    "info",
+                )
+                break
+            if self.get_context() == "object_value" and char in [",", "}"]:
+                rstring_delimiter_missing = True
+                # check if this is a case in which the closing comma is NOT missing instead
+                i = 1
+                next_c = self.get_char_at(i)
+                while next_c and next_c != rstring_delimiter:
+                    i += 1
+                    next_c = self.get_char_at(i)
+                if next_c:
+                    i += 1
+                    next_c = self.get_char_at(i)
+                    # found a delimiter, now we need to check that is followed strictly by a comma or brace
+                    while next_c and next_c.isspace():
+                        i += 1
+                        next_c = self.get_char_at(i)
+                    if next_c and next_c in [",", "}"]:
+                        rstring_delimiter_missing = False
+                if rstring_delimiter_missing:
                     self.log(
-                        "While parsing a string missing the left delimiter in object key context, we found a :, stopping here",
+                        "While parsing a string missing the left delimiter in object value context, we found a , or } and we couldn't determine that a right delimiter was present. Stopping here",
                         "info",
                     )
                     break
-                elif self.get_context() == "object_value" and char in [",", "}"]:
-                    rstring_delimiter_missing = True
-                    # check if this is a case in which the closing comma is NOT missing instead
-                    i = 1
-                    next_c = self.get_char_at(i)
-                    while next_c and next_c != rstring_delimiter:
-                        i += 1
-                        next_c = self.get_char_at(i)
-                    if next_c:
-                        i += 1
-                        next_c = self.get_char_at(i)
-                        # found a delimiter, now we need to check that is followed strictly by a comma or brace
-                        while next_c and next_c.isspace():
-                            i += 1
-                            next_c = self.get_char_at(i)
-                        if next_c and next_c in [",", "}"]:
-                            rstring_delimiter_missing = False
-                    if rstring_delimiter_missing:
-                        self.log(
-                            "While parsing a string missing the left delimiter in object value context, we found a , or } and we couldn't determine that a right delimiter was present. Stopping here",
-                            "info",
-                        )
-                        break
             string_acc += char
             self.index += 1
             char = self.get_char_at()
@@ -507,7 +508,7 @@ class JSONParser:
                         if next_c == "}":
                             # OK this is valid then
                             self.log(
-                                "While parsing a string, we a misplaced quote that would have closed the string but has a different meaning here since this is the last element of the object, ignoring it",
+                                "While parsing a string, we misplaced a quote that would have closed the string but has a different meaning here since this is the last element of the object, ignoring it",
                                 "info",
                             )
                             string_acc += str(char)
@@ -760,7 +761,7 @@ def from_file(
     return jsonobj
 
 
-def cli():  # pragma: no cover
+def cli(inline_args: Optional[List[str]] = None) -> int:
     parser = argparse.ArgumentParser(description="Repair and parse JSON files.")
     parser.add_argument("filename", help="The JSON file to repair")
     parser.add_argument(
@@ -769,10 +770,16 @@ def cli():  # pragma: no cover
         action="store_true",
         help="Replace the file inline instead of returning the output to stdout",
     )
+    parser.add_argument(
+        "-o",
+        "--output",
+        metavar="TARGET",
+        help="If specified, the output will be written to TARGET filename instead of stdout",
+    )
     parser.add_argument(
         "--ensure_ascii",
         action="store_true",
-        help="Pass the ensure_ascii parameter to json.dumps()",
+        help="Pass ensure_ascii=True to json.dumps()",
     )
     parser.add_argument(
         "--indent",
@@ -781,24 +788,36 @@ def cli():  # pragma: no cover
         help="Number of spaces for indentation (Default 2)",
     )
 
-    args = parser.parse_args()
+    if inline_args is None:  # pragma: no cover
+        args = parser.parse_args()
+    else:
+        args = parser.parse_args(
+            inline_args
+        )  # This is needed so this function is testable
+
+    if args.inline and args.output:  # pragma: no cover
+        print("Error: You cannot pass both --inline and --output", file=sys.stderr)
+        sys.exit(1)
 
     ensure_ascii = False
     if args.ensure_ascii:
         ensure_ascii = True
+
     try:
         result = from_file(args.filename)
 
-        if args.inline:
-            fd = open(args.filename, mode="w")
+        if args.inline or args.output:
+            fd = open(args.output or args.filename, mode="w")
             json.dump(result, fd, indent=args.indent, ensure_ascii=ensure_ascii)
             fd.close()
         else:
             print(json.dumps(result, indent=args.indent, ensure_ascii=ensure_ascii))
-    except Exception as e:
+    except Exception as e:  # pragma: no cover
         print(f"Error: {str(e)}", file=sys.stderr)
         sys.exit(1)
 
+    return 0  # Success
+
 
 if __name__ == "__main__":  # pragma: no cover
-    cli()
+    sys.exit(cli())

{json_repair-0.29.0.dist-info → json_repair-0.29.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: json_repair
-Version: 0.29.0
+Version: 0.29.2
 Summary: A package to repair broken json strings
 Author-email: Stefano Baccianella <4247706+mangiucugna@users.noreply.github.com>
 License: MIT License
@@ -156,24 +156,24 @@ Install the library for command-line with:
 ```
 pipx install json-repair
 ```
-then run
+to know all options available:
 ```
 $ json_repair -h
-
-usage: json_repair [-h] [-i] [--ensure_ascii] [--indent INDENT] filename
+usage: json_repair [-h] [-i] [-o TARGET] [--ensure_ascii] [--indent INDENT] filename
 
 Repair and parse JSON files.
 
 positional arguments:
-  filename         The JSON file to repair
+  filename              The JSON file to repair
 
 options:
-  -h, --help       show this help message and exit
-  -i, --inline     Replace the file inline instead of returning the output to stdout
-  --ensure_ascii   Pass the ensure_ascii parameter to json.dumps()
-  --indent INDENT  Number of spaces for indentation (Default 2)
+  -h, --help            show this help message and exit
+  -i, --inline          Replace the file inline instead of returning the output to stdout
+  -o TARGET, --output TARGET
+                        If specified, the output will be written to TARGET filename instead of stdout
+  --ensure_ascii        Pass ensure_ascii=True to json.dumps()
+  --indent INDENT       Number of spaces for indentation (Default 2)
 ```
-to learn how to use it
 
 ## Adding to requirements
 **Please pin this library only on the major version!**

json_repair-0.29.2.dist-info/RECORD

@@ -0,0 +1,10 @@
+json_repair/__init__.py,sha256=IIzSm1DsCRrr8seF3UeMZXwxcq-tE3j-8d1WBxvEJvE,178
+json_repair/__main__.py,sha256=EsJb-y89uZEvGQQg1GdIDWzfDwfOMvVekKEtdguQXCM,67
+json_repair/json_repair.py,sha256=anGQI5RxauBnZUO9QKoPU7JgN_sUaIddyiR4ecpMmm8,34060
+json_repair/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+json_repair-0.29.2.dist-info/LICENSE,sha256=wrjQo8MhNrNCicXtMe3MHmS-fx8AmQk1ue8AQwiiFV8,1076
+json_repair-0.29.2.dist-info/METADATA,sha256=Jtwl047L79Xj0CmA363Xc2EemzttgMWqYW0abi4a7fA,9787
+json_repair-0.29.2.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+json_repair-0.29.2.dist-info/entry_points.txt,sha256=SNfge3zPSP-ASqriYU9r3NAPaXdseYr7ciPMKdV2uSw,57
+json_repair-0.29.2.dist-info/top_level.txt,sha256=7-VZwZN2CgB_n0NlSLk-rEUFh8ug21lESbsblOYuZqw,12
+json_repair-0.29.2.dist-info/RECORD,,

{json_repair-0.29.0.dist-info → json_repair-0.29.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.1)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

json_repair-0.29.0.dist-info/RECORD

@@ -1,10 +0,0 @@
-json_repair/__init__.py,sha256=IIzSm1DsCRrr8seF3UeMZXwxcq-tE3j-8d1WBxvEJvE,178
-json_repair/__main__.py,sha256=EsJb-y89uZEvGQQg1GdIDWzfDwfOMvVekKEtdguQXCM,67
-json_repair/json_repair.py,sha256=hltJ3Qa4qFbUD3mVKkYvFWksnCcIZqx8zamKfBpjeNs,33538
-json_repair/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-json_repair-0.29.0.dist-info/LICENSE,sha256=wrjQo8MhNrNCicXtMe3MHmS-fx8AmQk1ue8AQwiiFV8,1076
-json_repair-0.29.0.dist-info/METADATA,sha256=yh0EJo-I1u0R6X-Gq9ETz0WbgmuGIhzR7Icw9W4Kee0,9630
-json_repair-0.29.0.dist-info/WHEEL,sha256=uCRv0ZEik_232NlR4YDw4Pv3Ajt5bKvMH13NUU7hFuI,91
-json_repair-0.29.0.dist-info/entry_points.txt,sha256=SNfge3zPSP-ASqriYU9r3NAPaXdseYr7ciPMKdV2uSw,57
-json_repair-0.29.0.dist-info/top_level.txt,sha256=7-VZwZN2CgB_n0NlSLk-rEUFh8ug21lESbsblOYuZqw,12
-json_repair-0.29.0.dist-info/RECORD,,