feat(cpn): Enhancements to update component runtime options (#2324)

* enh(cpn): Save update component asset options and manage in app settings

* Add option to delete decompress folders independent of delete download folder

* Fix sdsync to point to last update folder

* Update options dlg to allow choosing release channel and saving settings as defaults

* Rename params

* Asset options dialog shared between settings and update run. Add to Save as defaults
This commit is contained in:
Neil Horne
2022-09-26 08:55:16 +10:00
committed by GitHub
parent 30c54b48c9
commit 3563e917c6
31 changed files with 1016 additions and 555 deletions
+24 -12
View File
@@ -32,11 +32,6 @@ UpdateSounds::UpdateSounds(QWidget * parent) :
{
setName(tr("Sounds"));
setRepo(QString(GH_REPOS_EDGETX).append("/edgetx-sdcard-sounds"));
UpdateParameters::AssetParams &ap = dfltParams->addAsset();
ap.filterType = UpdateParameters::UFT_Startswith;
ap.filter = QString("edgetx-sdcard-sounds-%LANGUAGE%-");
ap.flags = dfltParams->data.flags | UPDFLG_CopyStructure;
}
UpdateSounds::~UpdateSounds()
@@ -44,6 +39,23 @@ UpdateSounds::~UpdateSounds()
delete langPacks;
}
void UpdateSounds::initAssetSettings()
{
if (!isValidSettingsIndex())
return;
g.component[settingsIndex()].initAllAssets();
ComponentAssetData &cad = g.component[settingsIndex()].asset[0];
cad.desc("sounds");
cad.processes(UPDFLG_Common_Asset);
cad.flags(cad.processes() | UPDFLG_CopyStructure);
cad.filterType(UpdateParameters::UFT_Startswith);
cad.filter("edgetx-sdcard-sounds-%LANGUAGE%-");
qDebug() << "Asset settings initialised";
}
bool UpdateSounds::flagAssets()
{
progressMessage(tr("Processing available sounds"));
@@ -52,12 +64,12 @@ bool UpdateSounds::flagAssets()
assets->setFilterPattern(pattern);
if (assets->count() < 0) {
reportProgress(tr("Asset not found in release '%1' using filter pattern '%2'").arg(releases->name().arg(pattern)), QtCriticalMsg);
reportProgress(tr("Asset not found in release '%1' using filter pattern '%2'").arg(releases->name()).arg(pattern), QtCriticalMsg);
return false;
}
else if (assets->count() > 1) {
reportProgress(tr("%1 assets found when %2 expected in release '%3' using filter pattern '%4'")
.arg(assets->count()).arg(1).arg(releases->name().arg(pattern)), QtCriticalMsg);
.arg(assets->count()).arg(1).arg(releases->name()).arg(pattern), QtCriticalMsg);
return false;
}
@@ -97,7 +109,7 @@ bool UpdateSounds::flagAssets()
lang = langVariant.split("-").at(0);
}
if (lang == runParams->data.language) {
if (lang == params->language) {
QStandardItem * item = new QStandardItem();
if (!obj.value("language").isUndefined())
@@ -118,7 +130,7 @@ bool UpdateSounds::flagAssets()
delete json;
if (langPacks->rowCount() < 1) {
reportProgress(tr("Language %1 not listed in %2").arg(runParams->data.language).arg(pattern), QtCriticalMsg);
reportProgress(tr("Language %1 not listed in %2").arg(params->language).arg(pattern), QtCriticalMsg);
return false;
}
@@ -130,7 +142,7 @@ bool UpdateSounds::flagAssets()
QItemSelectionModel *selItems = dlg->selectedItems();
if (!ok || !selItems->hasSelection()) {
QMessageBox::warning(this, CPN_STR_APP_NAME, tr("No language packs have been selected. Sounds update will be skipped!"));
QMessageBox::warning(progress, CPN_STR_APP_NAME, tr("No language packs have been selected. Sounds update will be skipped!"));
dlg->deleteLater();
return true;
}
@@ -156,7 +168,7 @@ bool UpdateSounds::flagLanguageAsset(QString lang)
{
progressMessage(tr("Flagging assets"));
runParams->data.language = lang;
UpdateParameters::AssetParams ap = runParams->data.assets[0];
params->language = lang;
UpdateParameters::AssetParams ap = params->assets[0];
return getSetAssets(ap);
}