From 560322a5a4d0fb6b1999cefe6eebae24f03c0769 Mon Sep 17 00:00:00 2001
From: pierre <pmithrandir@hotmail.com>
Date: Fri, 12 Jan 2024 22:55:32 +0100
Subject: [PATCH] Removing jsbeautifier from the project using the pure json
 lib which is more efficient.

---
 libosd/osdDbConnection.py                  | 12 ++++--------
 requirements.txt                           |  1 -
 user_tools/dataSummariser/summariseData.py |  9 ++-------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/libosd/osdDbConnection.py b/libosd/osdDbConnection.py
index 5baaeb0..b3514f1 100644
--- a/libosd/osdDbConnection.py
+++ b/libosd/osdDbConnection.py
@@ -6,7 +6,6 @@
 import os
 import json
 from xml.etree.ElementInclude import include
-import jsbeautifier
 import dateutil.parser
 import sklearn.model_selection
 
@@ -115,7 +114,7 @@ def saveEventsToFile(self, eventIdLst, fname, pretty=False, useCacheDir = False)
         fname : String
             Filename of file to be written
         pretty: Boolean
-            If true, use jsbeautifier to prettify output.
+            If true, prettify json output.
         useCacheDir: Boolean
             If true, save data to cache directory, other wise save to current working directory.
 
@@ -139,15 +138,12 @@ def saveEventsToFile(self, eventIdLst, fname, pretty=False, useCacheDir = False)
             fp = open(fpath, "w")
             if (pretty):
                 if (self.debug): print("OsdDbConnection.saveDbFile() - pretty output selected - saving prettified file")
-                jsonStr = json.dumps(eventsLst)
+                jsonStr = json.dumps(eventsLst, sort_keys=True, indent=2)
                 if (self.debug): print("OsdDbConnection.saveDbFile() - created JSON string")
-                options = jsbeautifier.default_options()
-                options.indent_size = 2
-                fp.write(jsbeautifier.beautify(jsonStr, options))
+                fp.write(jsonStr)
             else:
                 if (self.debug): print("OsdDbConnection.saveDbFile() - saving unformatted file")
                 json.dump(eventsLst,fp)
-            fp.close()
             if (self.debug):
                 print("OsdDbConnection.saveEventsToFile - fpath=%s closed." % fpath)
             return True
@@ -169,7 +165,7 @@ def saveDbFile(self, fname, pretty=False, useCacheDir=False):
         fname : String
             Filename of file to be written
         pretty: Boolean
-            If true, use jsbeautifier to prettify output.
+            If true, prettify json output.
         useCacheDir: Boolean
             If true, data is written to the cache directory, otherwise it is written to the current working directory.
 
diff --git a/requirements.txt b/requirements.txt
index 95dcf12..fe3a65e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,4 @@
 imblearn
-jsbeautifier
 jinja2
 matplotlib
 numpy
diff --git a/user_tools/dataSummariser/summariseData.py b/user_tools/dataSummariser/summariseData.py
index d9a468b..b1e7a0f 100755
--- a/user_tools/dataSummariser/summariseData.py
+++ b/user_tools/dataSummariser/summariseData.py
@@ -9,15 +9,12 @@
 import json
 import sys
 import os
-import importlib
 import dateutil.parser
 import datetime
 import numpy as np
 import jinja2
 import distutils.dir_util
 
-import jsbeautifier
-
 sys.path.append(os.path.join(os.path.dirname(__file__), '..','..'))
 import libosd.osdDbConnection
 import libosd.webApiConnection
@@ -167,10 +164,8 @@ def makeOutDir(eventObj, outDirParent="output"):
     #print("makeEventSummary - outDir=%s" % outDir)
 
     outFile = open(os.path.join(outDir,"rawData.json"),"w")
-    options = jsbeautifier.default_options()
-    options.indent_size = 2
-    jsonStr = json.dumps(eventObj,sort_keys=True)
-    outFile.write(jsbeautifier.beautify(jsonStr, options))
+    jsonStr = json.dumps(eventObj,sort_keys=True, indent=2)
+    outFile.write(jsonStr)
     
     outFile.close()
     return outDir