GerhardHoffmann/UpdatePTUDevCtrl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Make sure the path for the json-files and the decive-controller is correct.

Browse Source
This commit is contained in:
Gerhard Hoffmann 2023-12-15 09:39:46 +01:00
parent 0b4eed9dc0
commit 37aae73f21
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
worker.cpp
View File

@ -666,7 +666,9 @@ bool Worker::filesToUpdate() {
if (dir.exists()) { if (dir.exists()) {
QStringList jsons = dir.entryList(QStringList() << "DC2C*.json", QDir::Files); QStringList jsons = dir.entryList(QStringList() << "DC2C*.json", QDir::Files);
if (!jsons.isEmpty()) { if (!jsons.isEmpty()) {
m_filesToUpdate << jsons; for (QStringList::size_type i=0; i<jsons.size(); ++i) {
m_filesToUpdate << QDir::cleanPath(QString("etc/psa_config/") + jsons.at(i));
}
} }
} }
} }
@ -679,7 +681,7 @@ bool Worker::filesToUpdate() {
QStringList dc = dir.entryList(QStringList() << "dc2c.bin", QDir::Files, QStringList dc = dir.entryList(QStringList() << "dc2c.bin", QDir::Files,
QDir::SortFlag::Time | QDir::SortFlag::Reversed); QDir::SortFlag::Time | QDir::SortFlag::Reversed);
if (!dc.isEmpty()) { if (!dc.isEmpty()) {
m_filesToUpdate << dc.first(); m_filesToUpdate << QDir::cleanPath(QString("etc/dc/") + dc.first());
} }
} }
} }
@ -836,7 +838,16 @@ bool Worker::downloadFilesToPSAHardware() {
m_pluginName, m_pluginName,
m_workingDirectory); m_workingDirectory);
return update.doUpdate(m_displayIndex, m_filesToDownload); if (update.doUpdate(m_displayIndex, m_filesToDownload)) {
// prepared for use: at the moment, the dc-library does not work
// as expected.
// static const QRegularExpression re("^.*\\.json$");
// return update.checkDownloadedJsonVersions(m_filesToDownload.filter(re));
return true;
}
return false;
} else { } else {
CONSOLE(QStringList("NO FILES TO DOWNLOAD TO PSA-HW")) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE; CONSOLE(QStringList("NO FILES TO DOWNLOAD TO PSA-HW")) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE;
setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE); setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE);