From 7cccb0e76ea4d0d76c075fd709d29705f9c8ac62 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Mon, 22 Nov 2021 10:24:49 +0100
Subject: [PATCH] Read model names into models list while converting

---
 radio/src/storage/conversions/conversions.cpp | 10 ++++++++++
 radio/src/storage/sdcard_yaml.h               |  1 +
 2 files changed, 11 insertions(+)

diff --git a/radio/src/storage/conversions/conversions.cpp b/radio/src/storage/conversions/conversions.cpp
index e6078af65..6f96c37d8 100644
--- a/radio/src/storage/conversions/conversions.cpp
+++ b/radio/src/storage/conversions/conversions.cpp
@@ -118,6 +118,16 @@ void convertBinRadioData(const char * path, int version)
         error = convertBinModelData(filename, model_version);
         ++model_it;
 
+        if (error) {
+          TRACE("ERROR converting '%s': %s", filename, error);
+          category_ptr->removeModel(model_ptr);
+        } else {
+          PartialModel partial;
+          memclear(&partial, sizeof(PartialModel));
+          
+          readModelYaml(filename, reinterpret_cast<uint8_t*>(&partial), sizeof(partial));
+          model_ptr->setModelName(partial.header.name);
+        }
       } else {
         TRACE("ERROR reading '%s': %s", filename, error);
 
diff --git a/radio/src/storage/sdcard_yaml.h b/radio/src/storage/sdcard_yaml.h
index addbded18..a3240fbbd 100644
--- a/radio/src/storage/sdcard_yaml.h
+++ b/radio/src/storage/sdcard_yaml.h
@@ -23,3 +23,4 @@
 
 const char * loadRadioSettingsYaml();
 const char * writeModelYaml(const char* filename);
+const char * readModelYaml(const char * filename, uint8_t * buffer, uint32_t size);