From 41a0ebc68da0e55514637e96f6e49e8e9612eb6a Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@nyu.edu>
Date: Mon, 27 Apr 2020 02:00:11 -0400
Subject: [PATCH] Make minified JSON

---
 CTFd/utils/exports/encoders.py    | 11 -----------
 CTFd/utils/exports/serializers.py | 17 +++++++++++++----
 2 files changed, 13 insertions(+), 15 deletions(-)
 delete mode 100644 CTFd/utils/exports/encoders.py

diff --git a/CTFd/utils/exports/encoders.py b/CTFd/utils/exports/encoders.py
deleted file mode 100644
index 5643b9db..00000000
--- a/CTFd/utils/exports/encoders.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import json
-from datetime import datetime, date
-from decimal import Decimal
-
-
-class JSONEncoder(json.JSONEncoder):
-    def default(self, obj):
-        if isinstance(obj, (datetime, date)):
-            return obj.isoformat()
-        if isinstance(obj, Decimal):
-            return str(obj)
diff --git a/CTFd/utils/exports/serializers.py b/CTFd/utils/exports/serializers.py
index de161f22..6526265e 100644
--- a/CTFd/utils/exports/serializers.py
+++ b/CTFd/utils/exports/serializers.py
@@ -1,8 +1,16 @@
 import json
 import six
 from collections import defaultdict, OrderedDict
+from datetime import datetime, date
+from decimal import Decimal
 
-from CTFd.utils.exports.encoders import JSONEncoder
+
+class JSONEncoder(json.JSONEncoder):
+    def default(self, obj):
+        if isinstance(obj, (datetime, date)):
+            return obj.isoformat()
+        if isinstance(obj, Decimal):
+            return str(obj)
 
 
 class JSONSerializer(object):
@@ -20,8 +28,9 @@ class JSONSerializer(object):
         self.buckets[path].append(result)
 
     def wrap(self, result):
-        result = OrderedDict([("count", len(result)), ("results", result)])
-        result["meta"] = {}
+        result = OrderedDict(
+            [("count", len(result)), ("results", result), ("meta", {})]
+        )
         return result
 
     def close(self):
@@ -40,5 +49,5 @@ class JSONSerializer(object):
                     except ValueError:
                         pass
 
-            data = json.dumps(result, cls=JSONEncoder, indent=2)
+            data = json.dumps(result, cls=JSONEncoder, separators=(",", ":"))
             self.fileobj.write(data.encode("utf-8"))