ereuse/devicehub-django
8
0
Fork 0
Code Issues 5 Pull requests 9 Packages Projects Releases Wiki Activity

fix de correct device in document

Browse source
This commit is contained in:
Cayo Puigdefabregas 2025-02-12 12:18:30 +01:00
parent 8d37932aa0
commit f91818e515
5 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
did/views.py
View file

@ -107,16 +107,9 @@ class PublicDeviceWebView(TemplateView):
} }
dev = Build(self.object.last_evidence.doc, None, check=True) dev = Build(self.object.last_evidence.doc, None, check=True)
doc = dev.build.get_doc() doc = dev.build.get_doc()
components = [x for x in doc if x[0] != "computer"]
device = ''
for d in doc:
if d[0] == "computer":
device = d[1]
data['document'] = json.dumps(doc) data['document'] = json.dumps(doc)
data['device'] = device data['device'] = dev.device
data['components'] = components data['components'] = dev.components
self.object.get_evidences() self.object.get_evidences()
last_dpp = Proof.objects.filter( last_dpp = Proof.objects.filter(
@ -142,7 +135,7 @@ class PublicDeviceWebView(TemplateView):
for d in self.object.evidences: for d in self.object.evidences:
d.get_doc() d.get_doc()
dev = Build(d.doc, None, check=True) dev = Build(d.doc, None, check=True)
doc = dev.get_phid() doc = dev.build.get_doc()
ev = json.dumps(doc) ev = json.dumps(doc)
phid = dev.get_signature(doc) phid = dev.get_signature(doc)
dpp = "{}:{}".format(self.pk, phid) dpp = "{}:{}".format(self.pk, phid)

5
evidence/legacy_parse.py
View file

@ -66,4 +66,9 @@ class Build(BuildMix):
def _get_components(self): def _get_components(self):
data = ParseSnapshot(self.json) data = ParseSnapshot(self.json)
self.device = data.device
self.components = data.components self.components = data.components
self.device.pop("actions", None)
for c in self.components:
c.pop("actions", None)

2
evidence/mixin_parse.py
View file

@ -41,8 +41,6 @@ class BuildMix:
def get_doc(self): def get_doc(self):
self._get_components() self._get_components()
for c in self.components:
c.pop("actions", None)
components = sorted(self.components, key=lambda x: x.get("type")) components = sorted(self.components, key=lambda x: x.get("type"))
device = self.algorithms.get('ereuse22') device = self.algorithms.get('ereuse22')

5
evidence/normal_parse.py
View file

@ -61,4 +61,9 @@ class Build(BuildMix):
def _get_components(self): def _get_components(self):
data = ParseSnapshot(self.json) data = ParseSnapshot(self.json)
self.device = data.device
self.components = data.components self.components = data.components
self.device.pop("actions", None)
for c in self.components:
c.pop("actions", None)

12
evidence/old_parse.py
View file

@ -11,12 +11,12 @@ class Build(BuildMix):
# normaly is worbench 11 # normaly is worbench 11
def get_details(self): def get_details(self):
device = self.json.get('device', {}) self.device = self.json.get('device', {})
self.manufacturer = device.get("manufacturer", '') self.manufacturer = self.device.get("manufacturer", '')
self.model = device.get("model", '') self.model = self.device.get("model", '')
self.chassis = device.get("chassis", '') self.chassis = self.device.get("chassis", '')
self.serial_number = device.get("serialNumber", '') self.serial_number = self.device.get("serialNumber", '')
self.sku = device.get("sku", '') self.sku = self.device.get("sku", '')
def _get_components(self): def _get_components(self):
self.components = self.json.get("components", []) self.components = self.json.get("components", [])