repair bad jsons
This commit is contained in:
parent
e8d8c96700
commit
efcb53e062
|
@ -5,6 +5,8 @@ import hashlib
|
||||||
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from dmidecode import DMIParse
|
from dmidecode import DMIParse
|
||||||
|
from json_repair import repair_json
|
||||||
|
|
||||||
from evidence.models import Annotation
|
from evidence.models import Annotation
|
||||||
from evidence.xapian import index
|
from evidence.xapian import index
|
||||||
from utils.constants import ALGOS, CHASSIS_DH
|
from utils.constants import ALGOS, CHASSIS_DH
|
||||||
|
@ -20,7 +22,12 @@ def get_network_cards(child, nets):
|
||||||
def get_mac(lshw):
|
def get_mac(lshw):
|
||||||
nets = []
|
nets = []
|
||||||
try:
|
try:
|
||||||
get_network_cards(json.loads(lshw), nets)
|
hw = json.loads(lshw)
|
||||||
|
except json.decoder.JSONDecodeError:
|
||||||
|
hw = json.loads(repair_json(lshw))
|
||||||
|
|
||||||
|
try:
|
||||||
|
get_network_cards(hw, nets)
|
||||||
except Exception as ss:
|
except Exception as ss:
|
||||||
print("WARNING!! {}".format(ss))
|
print("WARNING!! {}".format(ss))
|
||||||
return
|
return
|
||||||
|
|
|
@ -3,6 +3,8 @@ import numpy as np
|
||||||
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from dmidecode import DMIParse
|
from dmidecode import DMIParse
|
||||||
|
from json_repair import repair_json
|
||||||
|
|
||||||
from utils.constants import CHASSIS_DH, DATASTORAGEINTERFACE
|
from utils.constants import CHASSIS_DH, DATASTORAGEINTERFACE
|
||||||
|
|
||||||
|
|
||||||
|
@ -480,7 +482,11 @@ class ParseSnapshot:
|
||||||
def loads(self, x):
|
def loads(self, x):
|
||||||
if isinstance(x, str):
|
if isinstance(x, str):
|
||||||
try:
|
try:
|
||||||
return json.loads(x)
|
try:
|
||||||
|
hw = json.loads(lshw)
|
||||||
|
except json.decoder.JSONDecodeError:
|
||||||
|
hw = json.loads(repair_json(lshw))
|
||||||
|
return hw
|
||||||
except Exception as ss:
|
except Exception as ss:
|
||||||
print("WARNING!! {}".format(ss))
|
print("WARNING!! {}".format(ss))
|
||||||
return {}
|
return {}
|
||||||
|
|
|
@ -10,4 +10,4 @@ pandas==2.2.2
|
||||||
xlrd==2.0.1
|
xlrd==2.0.1
|
||||||
odfpy==1.4.1
|
odfpy==1.4.1
|
||||||
pytz==2024.2
|
pytz==2024.2
|
||||||
|
json-repair==0.30.0
|
||||||
|
|
Loading…
Reference in New Issue