Merge pull request #8 from half-pie/try-fix-stop

fix: fix bug && add feature

Author: alingse

.travis.yml

@@ -13,6 +13,8 @@ script:
     - flake8 half_json tests --max-line-length=200
     - nosetests --cover-package=half_json --with-coverage
     - python setup.py install
+    - jsonfixer checks/oneline.json checks/oneline.fix.json
+    - cd checks && ./runtest.sh
 
 after_success:
   - coveralls

checks/oneline.json

@@ -1 +1 @@
-0.
+1]

half_json/core.py

@@ -22,7 +22,7 @@ def fix(self, line):
             pass
 
         ok, new_line = self.fixwithtry(line)
-        return FixResult(success=True, line=new_line, origin=False)
+        return FixResult(success=ok, line=new_line, origin=False)
 
     def fixwithtry(self, line):
         if self._max_try <= 0:
@@ -140,7 +140,23 @@ def patch_stop_iteration(self, line):
         # 1. }]
         # 2. ]}
         # 3. constans
-        return False, line
+        # 先 patch 完 {[]}
+        return False, patch_left_object_and_array(line)
+        # return False, line
+
+
+def patch_left_object_and_array(line):
+    # '}]{[' --> '[{}]{['
+    pairs = {'}': '{', ']': '['}
+    breaks = '{['
+    left = ""
+    for char in line:
+        if char in breaks:
+            break
+        if char in pairs:
+            left = pairs[char] + left
+
+    return left + line
 
 
 def insert_line(line, value, pos, end=None):

half_json/main.py

@@ -21,12 +21,13 @@ def fixjson():
             if not line:
                 continue
             total += 1
-            ok, new_line = fixer.fix(line)
-            if ok:
-                outf.write(new_line + "\n")
-                hit += 1
+            result = fixer.fix(line)
+            if result.success:
+                outf.write(result.line + "\n")
+                if not result.origin:
+                    hit += 1
             else:
-                print(ok, line, new_line)
+                print(result)
         except Exception as e:
             print(e, line)
     print("total is {} and hit {} --> ratio:{} \n".format(total, hit, hit * 1.0 / total))

setup.py

@@ -13,7 +13,7 @@
 
 setup(
     name='jsonfixer',
-    version='0.1.2',
+    version='0.1.3',
     url='https://github.com/half-pie/half-json',
     description='jsonfixer: fix invalid json: broken-json / truncated-json.',
     long_description=readme,

tests/test_stop.py

@@ -0,0 +1,23 @@
+# coding=utf8
+
+import unittest
+
+from half_json.core import JSONFixer
+
+
+class TestSimpleCase(unittest.TestCase):
+
+    def test_patch_left_object(self):
+        line = '}'
+        ok, newline, _ = JSONFixer().fix(line)
+        self.assertTrue(ok)
+        self.assertEqual('{}', newline)
+
+    def test_patch_left_array(self):
+        line = ']'
+        ok, newline, _ = JSONFixer().fix(line)
+        self.assertTrue(ok)
+        self.assertEqual('[]', newline)
+
+    # TODO
+    # '[]]'