fix: [companion] Show cause of error if unable to read from radio, scan MODELS dir if models.yml missing

Fallback to model file scanning if models.yml cannot be read
This commit is contained in:
Peter Feerick
2022-01-10 10:13:40 +10:00
committed by GitHub
4 changed files with 86 additions and 34 deletions
@@ -51,34 +51,27 @@ bool loadModelsListFromYaml(std::vector<CategoryData>& categories,
if (data.size() == 0) if (data.size() == 0)
return true; return true;
try { YAML::Node node = loadYamlFromByteArray(data);
YAML::Node node = loadYamlFromByteArray(data); if (!node.IsSequence()) return false;
if (!node.IsSequence()) return false;
int modelIdx = 0; int modelIdx = 0;
for (const auto& cat : node) { for (const auto& cat : node) {
if (!cat.IsMap()) continue;
if (!cat.IsMap()) continue; for (const auto& cat_map : cat) {
categories.push_back(cat_map.first.Scalar().c_str());
for (const auto& cat_map : cat) { const auto& models = cat_map.second;
categories.push_back(cat_map.first.Scalar().c_str()); if (!models.IsSequence()) continue;
const auto& models = cat_map.second; for (const auto& model : models) {
if (!models.IsSequence()) continue; std::string filename, name;
model["filename"] >> filename;
for (const auto& model : models) { model["name"] >> name;
std::string filename, name; modelFiles.push_back(
model["filename"] >> filename; {filename, name, (int)categories.size() - 1, modelIdx++});
model["name"] >> name;
modelFiles.push_back(
{filename, name, (int)categories.size() - 1, modelIdx++});
}
} }
} }
} catch (const std::runtime_error& e) {
qDebug() << "YAML::ParserException: " << e.what();
return false;
} }
return true; return true;
@@ -117,18 +110,35 @@ bool writeModelsListToYaml(const std::vector<CategoryData>& categories,
QByteArray& data) QByteArray& data)
{ {
YAML::Node node; YAML::Node node;
std::vector<CategoryData> cats = categories;
std::vector<EtxModelMetadata> files = { modelFiles.begin(), modelFiles.end() };
std::stable_sort(files.begin(), files.end(),
[](const EtxModelMetadata &a, const EtxModelMetadata &b) {
return a.category < b.category;
});
int catIdx = 0;
for (const auto& cat : cats) {
node[catIdx++][cat.name] = YAML::Node();
}
for (const auto& modelFile: modelFiles) { for (const auto& modelFile: modelFiles) {
YAML::Node cat_attrs; YAML::Node cat_attrs;
cat_attrs["filename"] = modelFile.filename; cat_attrs["filename"] = modelFile.filename;
cat_attrs["name"] = modelFile.name; cat_attrs["name"] = modelFile.name;
if (modelFile.category >= (int)categories.size()) { catIdx = modelFile.category;
return false; if (catIdx >= (int)cats.size()) {
catIdx = 0;
if (cats.size() == 0) {
cats.push_back("Models");
}
} }
const std::string cat_name = categories[modelFile.category].name; const std::string cat_name = cats[catIdx].name;
node[modelFile.category][cat_name].push_back(cat_attrs); node[catIdx][cat_name].push_back(cat_attrs);
} }
writeYamlToByteArray(node, data); writeYamlToByteArray(node, data);
+1
View File
@@ -671,6 +671,7 @@ void TreeModel::refresh()
defaultCategoryItem = rootItem->appendChild(0, -1); defaultCategoryItem = rootItem->appendChild(0, -1);
/*: Translators do NOT use accent for this, this is the default category name on Horus. */ /*: Translators do NOT use accent for this, this is the default category name on Horus. */
defaultCategoryItem->setData(0, tr("Models")); defaultCategoryItem->setData(0, tr("Models"));
radioData->categories.push_back(qPrintable(tr("Models")));
} }
categoryItem = defaultCategoryItem; categoryItem = defaultCategoryItem;
} }
+6 -2
View File
@@ -211,12 +211,16 @@ bool readSettingsSDCard(const QString & filename, ProgressWidget * progress)
RadioData radioData; RadioData radioData;
Storage inputStorage(radioPath); Storage inputStorage(radioPath);
if (!inputStorage.load(radioData)) { if (!inputStorage.load(radioData)) {
QMessageBox::critical(progress, CPN_STR_TTL_ERROR, QCoreApplication::translate("RadioInterface", "Failed to read Models and Settings from") % radioPath); QString errorMsg = inputStorage.error();
if (errorMsg.isEmpty()) {
errorMsg = QCoreApplication::translate("RadioInterface", "Failed to read Models and Settings from") % radioPath;
}
QMessageBox::critical(progress, CPN_STR_TTL_ERROR, errorMsg);
return false; return false;
} }
Storage outputStorage(filename); Storage outputStorage(filename);
if (!outputStorage.write(radioData)) { if (!outputStorage.write(radioData)) {
QMessageBox::critical(progress, CPN_STR_TTL_ERROR, QCoreApplication::translate("RadioInterface", "Failed to write Models and Setting file") % filename); QMessageBox::critical(progress, CPN_STR_TTL_ERROR, QCoreApplication::translate("RadioInterface", "Failed to write Models and Setting file") % " " % filename);
return false; return false;
} }
+43 -6
View File
@@ -31,7 +31,8 @@ bool CategorizedStorageFormat::load(RadioData & radioData)
if (st == STORAGE_TYPE_UNKNOWN) { if (st == STORAGE_TYPE_UNKNOWN) {
st = probeFormat(); st = probeFormat();
} }
if (st == STORAGE_TYPE_ETX || st == STORAGE_TYPE_YML) { if (st == STORAGE_TYPE_ETX || st == STORAGE_TYPE_YML
|| st == STORAGE_TYPE_UNKNOWN) {
return loadYaml(radioData); return loadYaml(radioData);
} else { } else {
return loadBin(radioData); return loadBin(radioData);
@@ -254,9 +255,35 @@ bool CategorizedStorageFormat::loadYaml(RadioData & radioData)
QByteArray modelslistBuffer; QByteArray modelslistBuffer;
if (loadFile(modelslistBuffer, "MODELS/models.yml")) { if (loadFile(modelslistBuffer, "MODELS/models.yml")) {
if (!loadModelsListFromYaml(radioData.categories, modelFiles, modelslistBuffer)) { try {
setError(tr("Can't load MODELS/models.yml")); if (!loadModelsListFromYaml(radioData.categories, modelFiles, modelslistBuffer)) {
return false; setError(tr("Can't load MODELS/models.yml"));
return false;
}
} catch(const std::runtime_error& e) {
setError(tr("Can't load MODELS/models.yml") + ":\n" + QString(e.what()));
//return false;
//TODO: fall back to directory scan
std::list<std::string> filelist;
if (!getFileList(filelist)) {
return false;
}
// push default category
radioData.categories.push_back("Models");
const std::regex yml_regex("MODELS/(model([0-9]+)\\.yml)");
for(const auto& f : filelist) {
std::smatch match;
if (std::regex_match(f, match, yml_regex)) {
if (match.size() == 3) {
std::ssub_match modelFile = match[1];
std::ssub_match modelIdx = match[2];
modelFiles.push_back({ modelFile.str(), "", 0, std::stoi(modelIdx.str()) });
}
}
}
} }
} else { } else {
// fetch "MODELS/modelXX.yml" // fetch "MODELS/modelXX.yml"
@@ -279,6 +306,9 @@ bool CategorizedStorageFormat::loadYaml(RadioData & radioData)
} }
} }
int modelIdx = 0;
bool hasCategories = getCurrentFirmware()->getCapability(HasModelCategories);
radioData.models.resize(modelFiles.size()); radioData.models.resize(modelFiles.size());
for (const auto& mc : modelFiles) { for (const auto& mc : modelFiles) {
qDebug() << "Filename: " << mc.filename.c_str() << " / Category: " << mc.category; qDebug() << "Filename: " << mc.filename.c_str() << " / Category: " << mc.category;
@@ -293,7 +323,7 @@ bool CategorizedStorageFormat::loadYaml(RadioData & radioData)
// Please note: // Please note:
// ModelData() use memset to clear everything to 0 // ModelData() use memset to clear everything to 0
// //
auto& model = radioData.models[mc.modelIdx]; auto& model = radioData.models[modelIdx];
try { try {
if (!loadModelFromYaml(model,modelBuffer)) { if (!loadModelFromYaml(model,modelBuffer)) {
@@ -306,10 +336,17 @@ bool CategorizedStorageFormat::loadYaml(RadioData & radioData)
} }
model.category = mc.category; model.category = mc.category;
model.modelIndex = mc.modelIdx; model.modelIndex = modelIdx;
strncpy(model.filename, mc.filename.c_str(), sizeof(model.filename)-1); strncpy(model.filename, mc.filename.c_str(), sizeof(model.filename)-1);
if (hasCategories && !strncmp(radioData.generalSettings.currModelFilename,
model.filename, sizeof(model.filename))) {
radioData.generalSettings.currModelIndex = modelIdx;
qDebug() << "currModelIndex =" << modelIdx;
}
model.used = true; model.used = true;
modelIdx++;
} }
return true; return true;