2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

fix error with parsed.app_desc to parsed.content.app_desc

Browse source
This commit is contained in:
Laura Klünder 2024-03-29 15:40:32 +01:00
parent 186f1a2887
commit 117be4238c
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/c3nav/mesh/models.py
View file

@ -122,7 +122,7 @@ class MeshNodeQuerySet(models.QuerySet):
fw_desc.get_lookup(): fw_desc for fw_desc in fw_desc.get_lookup(): fw_desc for fw_desc in
(build.firmware_description for build in FirmwareBuild.objects.filter( (build.firmware_description for build in FirmwareBuild.objects.filter(
sha256_hash__in=set( sha256_hash__in=set(
node.last_messages[MeshMessageType.CONFIG_FIRMWARE].parsed.app_desc.app_elf_sha256 node.last_messages[MeshMessageType.CONFIG_FIRMWARE].parsed.content.app_desc.app_elf_sha256
for node in self._result_cache for node in self._result_cache
if node.last_messages[MeshMessageType.CONFIG_FIRMWARE] if node.last_messages[MeshMessageType.CONFIG_FIRMWARE]
) )
@ -144,7 +144,7 @@ class MeshNodeQuerySet(models.QuerySet):
) )
try: try:
created_lookup = { created_lookup = {
msg.parsed.app_desc.app_elf_sha256: msg.datetime msg.parsed.content.app_desc.app_elf_sha256: msg.datetime
for msg in NodeMessage.objects.filter( for msg in NodeMessage.objects.filter(
message_type=MeshMessageType.CONFIG_FIRMWARE.name, message_type=MeshMessageType.CONFIG_FIRMWARE.name,
data__app_elf_sha256__in=(node._firmware_description.sha256_hash data__app_elf_sha256__in=(node._firmware_description.sha256_hash
@ -382,7 +382,7 @@ class NodeMessage(models.Model):
return '(#%d) %s at %s' % (self.pk, self.get_message_type_display(), self.datetime) return '(#%d) %s at %s' % (self.pk, self.get_message_type_display(), self.datetime)
@cached_property @cached_property
def parsed(self) -> Self: def parsed(self) -> MeshMessage:
return MeshMessage.model_validate(self.data) return MeshMessage.model_validate(self.data)

6
src/c3nav/mesh/templates/mesh/mesh_messages.html
View file

@ -72,11 +72,11 @@
{% endif %} {% endif %}
{% elif msg.message_type == "CONFIG_FIRMWARE" %} {% elif msg.message_type == "CONFIG_FIRMWARE" %}
<strong>Firmware:</strong> {{ msg.parsed.app_desc.project_name }} {{ msg.parsed.app_desc.version }} (IDF {{ msg.parsed.app_desc.idf_version }}) <strong>Firmware:</strong> {{ msg.parsed.content.app_desc.project_name }} {{ msg.parsed.content.app_desc.version }} (IDF {{ msg.parsed.content.app_desc.idf_version }})
<br> <br>
<strong>Compile Date:</strong> {{ msg.parsed.app_desc.compile_date }} {{ msg.parsed.app_desc.compile_time }} <strong>Compile Date:</strong> {{ msg.parsed.content.app_desc.compile_date }} {{ msg.parsed.content.app_desc.compile_time }}
<br> <br>
<strong>SHA256:</strong> <small>{{ msg.parsed.app_desc.app_elf_sha256 }}</small> <strong>SHA256:</strong> <small>{{ msg.parsed.content.app_desc.app_elf_sha256 }}</small>
{% elif msg.message_type == "CONFIG_UPLINK" %} {% elif msg.message_type == "CONFIG_UPLINK" %}
<strong>Enabled:</strong> {{ msg.parsed.enabled }}, <strong>Enabled:</strong> {{ msg.parsed.enabled }},