chore: optimize json dump

Author: JinnLynn

src/genpac/format/pac.py

@@ -1,7 +1,5 @@
-import json
-
 from ..template import TemplateFile
-from ..util import conv_bool
+from ..util import conv_bool, dump_json
 from .base import formater, FmtBase
 
 _TPL_PAC = TemplateFile('res/tpl-pac.js', True)
@@ -42,7 +40,7 @@ def pre_generate(self):
         return super().pre_generate()
 
     def generate(self, replacements):
-        rules = json.dumps(
+        rules = dump_json(
             self.precise_rules if self.options.precise else self.rules,
             indent=None if self.options.compress else 4,
             separators=(',', ':') if self.options.compress else None)

src/genpac/format/sing_box.py

@@ -1,6 +1,4 @@
-import json
-
-from ..util import conv_lower, Namespace
+from ..util import conv_lower, Namespace, dump_json
 from .base import formater
 from .ip import IPInterface, _IP_FAMILIES, _CC_DEF
 
@@ -30,4 +28,4 @@ def generate(self, replacements):
             data.rules.append({
                 'ip_cidr': [str(d) for d in self.iter_ip_cidr(self.options.ip_family, self.options.ip_cc)]
             })
-        return json.dumps(dict(data), indent=2)
+        return dump_json(data)

src/genpac/format/v2ray.py

@@ -1,10 +1,8 @@
-import json
-
 from ..util import dump_yaml
-from ..util import conv_lower
+from ..util import conv_lower, dump_json
 from .base import formater, FmtBase, TPL_LEAD_COMMENT
 
-V2RAY_DUMPER = {'json': lambda d: json.dumps(d, indent=4),
+V2RAY_DUMPER = {'json': lambda d: dump_json(d),
                 'yaml': lambda d: f'{TPL_LEAD_COMMENT}\n' + dump_yaml(d)}
 _DEF_FORMAT = list(V2RAY_DUMPER.keys())[0]
 _DEF_PROXY_TAG = 'proxy'

src/genpac/util.py

@@ -59,6 +59,19 @@ def dump_yaml(data, **kwargs):
     return yaml.dump(data, **kwargs)
 
 
+class JSONEncoder(json.JSONEncoder):
+    def default(self, o):
+        if isinstance(o, Namespace):
+            return dict(o)
+        return super().default(o)
+
+
+def dump_json(data, **kwargs):
+    kwargs.setdefault('indent', 2)
+    kwargs.setdefault('cls', JSONEncoder)
+    return json.dumps(data, **kwargs)
+
+
 class Error(Exception):
     def __init__(self, msg):
         self.msg = msg