Compare commits
13 Commits
f2534c7763
...
3e1a4ab09c
Author | SHA1 | Date | |
---|---|---|---|
3e1a4ab09c | |||
ee203e7672 | |||
55c82eb509 | |||
f60cd9e4ef | |||
a9fb7a3630 | |||
db82f2af0d | |||
8b2e2d2086 | |||
5870f61395 | |||
aaa0f1e76c | |||
0d9a224977 | |||
d191020caa | |||
2b68242d04 | |||
bd785e7df1 |
@ -127,6 +127,11 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
|||||||
# 1.4.8 : Improve reading Json-file versions of Json-files actually loaded
|
# 1.4.8 : Improve reading Json-file versions of Json-files actually loaded
|
||||||
# in DC. If available, show version info instead of blob-info of
|
# in DC. If available, show version info instead of blob-info of
|
||||||
# Json file.
|
# Json file.
|
||||||
|
# 1.4.9 : Improve ISMAS output: add messages for JSON downloads.
|
||||||
|
# Do not send CHECK_ISMAS_TRIGGER_SUCCESS to ISMAS for an automatic
|
||||||
|
# update.
|
||||||
|
# In case there is an automatic update (00:00-04:00) use M0100 instead
|
||||||
|
# of U0002.
|
||||||
VERSION="1.4.9"
|
VERSION="1.4.9"
|
||||||
# PLANNED TODOS:
|
# PLANNED TODOS:
|
||||||
# 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
|
# 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
|
||||||
|
@ -410,7 +410,7 @@ bool Update::downloadJson(enum FileTypeJson type,
|
|||||||
lst << msg;
|
lst << msg;
|
||||||
|
|
||||||
if (m_worker) {
|
if (m_worker) {
|
||||||
m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
|
m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -463,22 +463,20 @@ bool Update::downloadJson(enum FileTypeJson type,
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
if (m_worker) {
|
if (m_worker) {
|
||||||
if (templateIdx >= 1 && templateIdx <= 32) {
|
|
||||||
msg = QString("SUCCESSFULLY LOADED %1 (INDEX=%2) TO DC").arg(file.fileName()).arg(templateIdx);
|
|
||||||
} else {
|
|
||||||
msg = QString("SUCCESSFULLY LOADED %1 (KIND=%2) TO DC").arg(file.fileName()).arg((uint8_t)type);
|
|
||||||
}
|
|
||||||
lst.clear();
|
lst.clear();
|
||||||
lst << msg;
|
if (templateIdx >= 1 && templateIdx <= 32) {
|
||||||
m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
|
lst << QString("LOADED %1 (%2) TO DC").arg(fi.fileName()).arg(templateIdx);
|
||||||
|
} else {
|
||||||
|
lst << QString("LOADED %1 (%2) TO DC").arg(fi.fileName()).arg((uint8_t)type);
|
||||||
|
}
|
||||||
|
m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_JSON_FILE));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
msg = QString("ERROR SEND JSON-FILE %1 TO DC").arg(file.fileName());
|
msg = QString("ERROR SEND JSON-FILE %1 TO DC").arg(file.fileName());
|
||||||
Utils::printCriticalErrorMsg(msg);
|
Utils::printCriticalErrorMsg(msg);
|
||||||
lst << msg;
|
lst << msg;
|
||||||
if (m_worker) {
|
if (m_worker) {
|
||||||
m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
|
m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE);
|
||||||
<< Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -486,8 +484,7 @@ bool Update::downloadJson(enum FileTypeJson type,
|
|||||||
Utils::printCriticalErrorMsg(msg);
|
Utils::printCriticalErrorMsg(msg);
|
||||||
lst << msg;
|
lst << msg;
|
||||||
if (m_worker) {
|
if (m_worker) {
|
||||||
m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
|
m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE);
|
||||||
<< Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -496,8 +493,7 @@ bool Update::downloadJson(enum FileTypeJson type,
|
|||||||
lst << msg;
|
lst << msg;
|
||||||
|
|
||||||
if (m_worker) {
|
if (m_worker) {
|
||||||
m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
|
m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE);
|
||||||
<< Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -506,8 +502,7 @@ bool Update::downloadJson(enum FileTypeJson type,
|
|||||||
lst << msg;
|
lst << msg;
|
||||||
|
|
||||||
if (m_worker) {
|
if (m_worker) {
|
||||||
m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
|
m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE);
|
||||||
<< Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -956,45 +951,58 @@ bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
|
|||||||
res = false;
|
res = false;
|
||||||
} else {
|
} else {
|
||||||
if ((res = updatePrinterTemplate(templateIdx, fToWorkOn))) {
|
if ((res = updatePrinterTemplate(templateIdx, fToWorkOn))) {
|
||||||
Utils::printInfoMsg(
|
if (m_worker) {
|
||||||
QString("DOWNLOADED PRINTER TEMPLATE %1 WITH INDEX=%2")
|
QStringList lst(QString("DL:%1 (%2)").arg(QFileInfo(fToWorkOn).fileName()).arg(templateIdx));
|
||||||
.arg(fToWorkOn)
|
m_worker->ISMAS(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_JSON_FILE_SUCCESS);
|
||||||
.arg(templateIdx));
|
|
||||||
++displayIndex;
|
++displayIndex;
|
||||||
emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
|
emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
|
||||||
+ QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
+ QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
||||||
Worker::UPDATE_STEP_DONE);
|
Worker::UPDATE_STEP_DONE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (fToWorkOn.contains("DC2C_cash", Qt::CaseInsensitive)
|
} else if (fToWorkOn.contains("DC2C_cash", Qt::CaseInsensitive)
|
||||||
&& fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
|
&& fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
|
||||||
res = true;
|
res = true;
|
||||||
if ((res = updateCashConf(fToWorkOn))) {
|
if ((res = updateCashConf(fToWorkOn))) {
|
||||||
Utils::printInfoMsg(QString("DOWNLOADED CASH TEMPLATE %1").arg(fToWorkOn));
|
if (m_worker) {
|
||||||
++displayIndex;
|
QStringList lst(QString("DL:%1").arg(QFileInfo(fToWorkOn).fileName()));
|
||||||
emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
|
m_worker->ISMAS(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_CASH_FILE_SUCCESS);
|
||||||
+ QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
|
||||||
Worker::UPDATE_STEP_DONE);
|
++displayIndex;
|
||||||
|
emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
|
||||||
|
+ QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
||||||
|
Worker::UPDATE_STEP_DONE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else if (fToWorkOn.contains("DC2C_conf", Qt::CaseInsensitive)
|
} else if (fToWorkOn.contains("DC2C_conf", Qt::CaseInsensitive)
|
||||||
&& fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
|
&& fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
|
||||||
res = true;
|
res = true;
|
||||||
if ((res= updateConfig(fToWorkOn))) {
|
if ((res= updateConfig(fToWorkOn))) {
|
||||||
Utils::printInfoMsg(QString("DOWNLOADED CONFIG TEMPLATE %1").arg(fToWorkOn));
|
if (m_worker) {
|
||||||
++displayIndex;
|
QStringList lst(QString("DL:%1").arg(QFileInfo(fToWorkOn).fileName()));
|
||||||
emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
|
m_worker->ISMAS(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_CONFIG_FILE_SUCCESS);
|
||||||
+ QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
|
||||||
Worker::UPDATE_STEP_DONE);
|
++displayIndex;
|
||||||
|
emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
|
||||||
|
+ QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
||||||
|
Worker::UPDATE_STEP_DONE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else if (fToWorkOn.contains("DC2C_device", Qt::CaseInsensitive)
|
} else if (fToWorkOn.contains("DC2C_device", Qt::CaseInsensitive)
|
||||||
&& fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
|
&& fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
|
||||||
res = true;
|
res = true;
|
||||||
if ((res = updateDeviceConf(fToWorkOn))) {
|
if ((res = updateDeviceConf(fToWorkOn))) {
|
||||||
Utils::printInfoMsg(QString("DOWNLOADED DEVICE TEMPLATE %1").arg(fToWorkOn));
|
if (m_worker) {
|
||||||
++displayIndex;
|
QStringList lst(QString("DL:%1").arg(QFileInfo(fToWorkOn).fileName()));
|
||||||
emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
|
m_worker->ISMAS(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_DEVICE_FILE_SUCCESS);
|
||||||
+ QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
|
||||||
Worker::UPDATE_STEP_DONE);
|
++displayIndex;
|
||||||
|
emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
|
||||||
|
+ QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
||||||
|
Worker::UPDATE_STEP_DONE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
qCritical() << "UNKNOWN JSON FILE NAME" << fToWorkOn;
|
qCritical() << "UNKNOWN JSON FILE NAME" << fToWorkOn;
|
||||||
|
@ -293,7 +293,7 @@ bool Utils::sameFilesInDirs(QDir const &dir1, QDir const &dir2,
|
|||||||
}
|
}
|
||||||
if (fileNameLst1 != fileNameLst2) {
|
if (fileNameLst1 != fileNameLst2) {
|
||||||
printCriticalErrorMsg(dirPath1 + " AND " + dirPath2
|
printCriticalErrorMsg(dirPath1 + " AND " + dirPath2
|
||||||
+ " DIFFER: [" + fileNameLst1.join(',') + "],["
|
+ " HAVE DIFFERENT FILES: [" + fileNameLst1.join(',') + "],["
|
||||||
+ fileNameLst2.join(',') + "]");
|
+ fileNameLst2.join(',') + "]");
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
@ -323,7 +323,7 @@ bool Utils::sameFilesInDirs(QDir const &dir1, QDir const &dir2,
|
|||||||
|
|
||||||
if (gitBlobLst1 != gitBlobLst2) {
|
if (gitBlobLst1 != gitBlobLst2) {
|
||||||
printCriticalErrorMsg(dirPath1 + " AND " + dirPath2
|
printCriticalErrorMsg(dirPath1 + " AND " + dirPath2
|
||||||
+ " DIFFER: [" + gitBlobLst1.join(',') + "],["
|
+ " HAVE DIFFERENT BLOBS: [" + gitBlobLst1.join(',') + "],["
|
||||||
+ gitBlobLst2.join(',') + "]");
|
+ gitBlobLst2.join(',') + "]");
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
|
@ -89,6 +89,15 @@ const QMap<UPDATE_STEP, const char*> Worker::smap (
|
|||||||
INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_CONFIG_FILE),
|
INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_CONFIG_FILE),
|
||||||
INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_CONFIG_FILE_SUCCESS),
|
INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_CONFIG_FILE_SUCCESS),
|
||||||
INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_CONFIG_FILE_FAILURE),
|
INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_CONFIG_FILE_FAILURE),
|
||||||
|
INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_CASH_FILE),
|
||||||
|
INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_CASH_FILE_FAILURE),
|
||||||
|
INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_CASH_FILE_SUCCESS),
|
||||||
|
INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_DEVICE_FILE),
|
||||||
|
INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_DEVICE_FILE_FAILURE),
|
||||||
|
INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_DEVICE_FILE_SUCCESS),
|
||||||
|
INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_JSON_FILE),
|
||||||
|
INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE),
|
||||||
|
INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_JSON_FILE_SUCCESS),
|
||||||
INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER),
|
INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER),
|
||||||
INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER_SUCCESS),
|
INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER_SUCCESS),
|
||||||
INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER_FAILURE),
|
INSERT_ELEMENT(UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER_FAILURE),
|
||||||
@ -316,7 +325,7 @@ void Worker::privateUpdate() {
|
|||||||
|
|
||||||
QStringList lst = m_ismasTriggerStatusMessage;
|
QStringList lst = m_ismasTriggerStatusMessage;
|
||||||
// trigger message to ISMAS and CONSOLE
|
// trigger message to ISMAS and CONSOLE
|
||||||
ISMAS(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_SUCCESS));
|
CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::CHECK_ISMAS_TRIGGER_SUCCESS);
|
||||||
// overwrite m_lastFailedUpdateStep
|
// overwrite m_lastFailedUpdateStep
|
||||||
m_lastFailedUpdateStep = UPDATE_STEP::NONE;
|
m_lastFailedUpdateStep = UPDATE_STEP::NONE;
|
||||||
return;
|
return;
|
||||||
@ -502,9 +511,8 @@ void Worker::privateUpdate() {
|
|||||||
if ((continueUpdate = downloadFilesToPSAHardware()) == false) {
|
if ((continueUpdate = downloadFilesToPSAHardware()) == false) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
lst = QStringList(QString(smap[UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS]));
|
lst = QStringList(QString("DONE"));
|
||||||
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
|
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS));
|
||||||
setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS);
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
@ -954,13 +962,16 @@ bool Worker::execOpkgCommands() {
|
|||||||
|
|
||||||
bool Worker::downloadFilesToPSAHardware() {
|
bool Worker::downloadFilesToPSAHardware() {
|
||||||
m_displayIndex = 0;
|
m_displayIndex = 0;
|
||||||
|
QStringList lst(QString("START"));
|
||||||
|
|
||||||
GUI(m_filesToDownload) << (CONSOLE(m_filesToDownload) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE);
|
ISMAS(lst) << (GUI(m_filesToDownload) << (CONSOLE(m_filesToDownload) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
|
||||||
setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE);
|
|
||||||
|
|
||||||
if (m_noUpdatePsaHardware == false) {
|
if (m_noUpdatePsaHardware == false) {
|
||||||
if (computeFilesToDownload() > 0) {
|
if (computeFilesToDownload() > 0) {
|
||||||
QStringList lst = m_filesToDownload;
|
lst.clear();
|
||||||
|
for (int i = 0; i < m_filesToDownload.size(); ++i) {
|
||||||
|
lst << QFileInfo(m_filesToDownload.at(i)).fileName();
|
||||||
|
}
|
||||||
ISMAS(lst) << (CONSOLE(lst) << UPDATE_STEP::FILES_TO_DOWNLOAD);
|
ISMAS(lst) << (CONSOLE(lst) << UPDATE_STEP::FILES_TO_DOWNLOAD);
|
||||||
|
|
||||||
if (m_update && m_update->doUpdate(m_displayIndex, m_filesToDownload)) {
|
if (m_update && m_update->doUpdate(m_displayIndex, m_filesToDownload)) {
|
||||||
@ -973,7 +984,7 @@ bool Worker::downloadFilesToPSAHardware() {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE);
|
ISMAS(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE));
|
||||||
setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE);
|
setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE);
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
@ -984,14 +995,20 @@ bool Worker::downloadFilesToPSAHardware() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool Worker::syncCustomerRepositoryAndFS() {
|
bool Worker::syncCustomerRepositoryAndFS() {
|
||||||
ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY));
|
QString msg("START");
|
||||||
|
QStringList lst(msg);
|
||||||
|
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY));
|
||||||
|
lst.clear();
|
||||||
|
|
||||||
if (QDir(m_customerRepository).exists()) {
|
if (QDir(m_customerRepository).exists()) {
|
||||||
if (QDir::setCurrent(m_customerRepository)) {
|
if (QDir::setCurrent(m_customerRepository)) {
|
||||||
Command md("bash");
|
Command md("bash");
|
||||||
if (!md.execute(m_customerRepository,
|
if (!md.execute(m_customerRepository,
|
||||||
QStringList() << "-c" << "mkdir -p /etc/psa_config /etc/dc /etc/psa_tariff")) {
|
QStringList() << "-c" << "mkdir -p /etc/psa_config /etc/dc /etc/psa_tariff")) {
|
||||||
qCritical() << "COULD NOT EXECUTE '" << md.command() << "' exitCode=(" << md.exitCode() << ")";
|
msg = QString("COULD NOT EXECUTE '%1', exitCode=%2").arg(md.command()).arg(md.exitCode());
|
||||||
|
qCritical() << msg;
|
||||||
|
QStringList lst2(msg);
|
||||||
|
ISMAS(lst2) << (CONSOLE(lst2) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY);
|
||||||
}
|
}
|
||||||
QString const params("-v "
|
QString const params("-v "
|
||||||
"--recursive "
|
"--recursive "
|
||||||
@ -1050,12 +1067,22 @@ bool Worker::syncCustomerRepositoryAndFS() {
|
|||||||
error = true;
|
error = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (!error) {
|
||||||
|
lst.clear();
|
||||||
|
lst << QString("SUCCESS %1").arg(cmd);
|
||||||
|
ISMAS(lst) << (CONSOLE(lst) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY);
|
||||||
|
} else {
|
||||||
|
msg = QString("FAILURE %1").arg(cmd);
|
||||||
|
lst << msg;
|
||||||
|
QStringList lst2(msg);
|
||||||
|
ISMAS(lst2) << (CONSOLE(lst2) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (!error) {
|
if (!error) {
|
||||||
// now check tariff-files in etc and /etc/psa_tariff
|
// now check tariff-files in etc and /etc/psa_tariff
|
||||||
QDir dir1(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_tariff"));
|
QDir dir1(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_tariff"));
|
||||||
QDir dir2("/etc/psa_tariff");
|
QDir dir2("/etc/psa_tariff");
|
||||||
if (Utils::sameFilesInDirs(dir1, dir2)) {
|
if (Utils::sameFilesInDirs(dir1, dir2) == false) {
|
||||||
CONSOLE() << QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_tariff")
|
CONSOLE() << QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_tariff")
|
||||||
<< "AND /etc/psa_tariff ARE DIFFERENT: CHANGED CUSTOMER-NUMBER?";
|
<< "AND /etc/psa_tariff ARE DIFFERENT: CHANGED CUSTOMER-NUMBER?";
|
||||||
}
|
}
|
||||||
@ -1063,9 +1090,13 @@ bool Worker::syncCustomerRepositoryAndFS() {
|
|||||||
setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
|
setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
lst << QString("CAN NOT CD TO CUST-REPO %1").arg(m_customerRepository);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
lst << QString("CUST-REPO %1 DOES NOT EXIST").arg(m_customerRepository);
|
||||||
}
|
}
|
||||||
ISMAS() << (GUI() << (CONSOLE() << (m_lastFailedUpdateStep = UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_FAILURE)));
|
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_FAILURE)));
|
||||||
setProgress(_SYNC_CUSTOMER_REPOSITORY_FAILURE);
|
setProgress(_SYNC_CUSTOMER_REPOSITORY_FAILURE);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -35,12 +35,13 @@
|
|||||||
! U0003: Update finished but FAILed.
|
! U0003: Update finished but FAILed.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define _ISMAS_DONE "U0001" // 100%, Check: Resultcode: 0
|
#define _ISMAS_DONE "U0001" // 100%, Check: Resultcode: 0
|
||||||
#define _ISMAS_SET_WAIT_OK "U0002" // empty WAIT-button (""), ResultCode: 0
|
#define _ISMAS_SET_WAIT_OK "U0002" // empty WAIT-button (""), ResultCode: 0
|
||||||
#define _ISMAS_FAILURE "U0003" // FAIL
|
#define _ISMAS_NO_UPDATE_NECESSARY "M0100" // empty WAIT-button (""), ResultCode: 0
|
||||||
#define _ISMAS_CONTINUE "U0010" // %-values: Update laeuft, Resultcodes entsprechend laufender Schritt
|
#define _ISMAS_FAILURE "U0003" // FAIL
|
||||||
#define _ISMAS_RESET_WAIT "ISMAS" // reset WAIT-button to "WAIT"
|
#define _ISMAS_CONTINUE "U0010" // %-values: Update laeuft, Resultcodes entsprechend laufender Schritt
|
||||||
#define _ISMAS_TEST_TRIGGER "U0099" // check the WAIT-button
|
#define _ISMAS_RESET_WAIT "ISMAS" // reset WAIT-button to "WAIT"
|
||||||
|
#define _ISMAS_TEST_TRIGGER "U0099" // check the WAIT-button
|
||||||
|
|
||||||
#define _STARTED (1)
|
#define _STARTED (1)
|
||||||
#define _CHECK_ISMAS_TRIGGER (2)
|
#define _CHECK_ISMAS_TRIGGER (2)
|
||||||
@ -79,7 +80,6 @@
|
|||||||
#define _SYNC_CUSTOMER_REPOSITORY_SUCCESS (35)
|
#define _SYNC_CUSTOMER_REPOSITORY_SUCCESS (35)
|
||||||
#define _FILES_TO_UPDATE (36)
|
#define _FILES_TO_UPDATE (36)
|
||||||
#define _CHECK_FOR_REPOSITORY_CHANGES_FAILURE (37)
|
#define _CHECK_FOR_REPOSITORY_CHANGES_FAILURE (37)
|
||||||
#define _FILES_TO_DOWNLOAD (38)
|
|
||||||
#define _EXEC_OPKG_COMMANDS (39)
|
#define _EXEC_OPKG_COMMANDS (39)
|
||||||
#define _EXEC_OPKG_COMMAND_1 (40)
|
#define _EXEC_OPKG_COMMAND_1 (40)
|
||||||
#define _EXEC_OPKG_COMMAND_2 (41)
|
#define _EXEC_OPKG_COMMAND_2 (41)
|
||||||
@ -93,13 +93,23 @@
|
|||||||
#define _EXEC_OPKG_COMMAND_LAST (49)
|
#define _EXEC_OPKG_COMMAND_LAST (49)
|
||||||
#define _EXEC_OPKG_COMMAND_FAILURE (50)
|
#define _EXEC_OPKG_COMMAND_FAILURE (50)
|
||||||
#define _EXEC_OPKG_COMMAND_SUCCESS (51)
|
#define _EXEC_OPKG_COMMAND_SUCCESS (51)
|
||||||
#define _DOWNLOAD_FILES_TO_PSA_HARDWARE (60)
|
#define _DOWNLOAD_FILES_TO_PSA_HARDWARE (59)
|
||||||
#define _DOWNLOAD_CONFIG_FILE (61)
|
#define _FILES_TO_DOWNLOAD (60)
|
||||||
#define _DOWNLOAD_CONFIG_FILE_SUCCESS (62)
|
#define _DOWNLOAD_CASH_FILE (61)
|
||||||
#define _DOWNLOAD_CONFIG_FILE_FAILURE (63)
|
#define _DOWNLOAD_CASH_FILE_FAILURE (62)
|
||||||
#define _DOWNLOAD_DEVICE_CONTROLLER (64)
|
#define _DOWNLOAD_CASH_FILE_SUCCESS (63)
|
||||||
#define _DOWNLOAD_DEVICE_CONTROLLER_SUCCESS (85)
|
#define _DOWNLOAD_CONFIG_FILE (64)
|
||||||
#define _DOWNLOAD_DEVICE_CONTROLLER_FAILURE (86)
|
#define _DOWNLOAD_CONFIG_FILE_FAILURE (65)
|
||||||
|
#define _DOWNLOAD_CONFIG_FILE_SUCCESS (66)
|
||||||
|
#define _DOWNLOAD_DEVICE_FILE (67)
|
||||||
|
#define _DOWNLOAD_DEVICE_FILE_FAILURE (68)
|
||||||
|
#define _DOWNLOAD_DEVICE_FILE_SUCCESS (69)
|
||||||
|
#define _DOWNLOAD_JSON_FILE (70)
|
||||||
|
#define _DOWNLOAD_JSON_FILE_FAILURE (71)
|
||||||
|
#define _DOWNLOAD_JSON_FILE_SUCCESS (72)
|
||||||
|
#define _DOWNLOAD_DEVICE_CONTROLLER (84)
|
||||||
|
#define _DOWNLOAD_DEVICE_CONTROLLER_FAILURE (85)
|
||||||
|
#define _DOWNLOAD_DEVICE_CONTROLLER_SUCCESS (86)
|
||||||
#define _DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE (87)
|
#define _DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE (87)
|
||||||
#define _DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS (88)
|
#define _DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS (88)
|
||||||
#define _SAVE_LOGS (92)
|
#define _SAVE_LOGS (92)
|
||||||
@ -326,6 +336,15 @@ public:
|
|||||||
DOWNLOAD_CONFIG_FILE = _DOWNLOAD_CONFIG_FILE,
|
DOWNLOAD_CONFIG_FILE = _DOWNLOAD_CONFIG_FILE,
|
||||||
DOWNLOAD_CONFIG_FILE_SUCCESS = _DOWNLOAD_CONFIG_FILE_SUCCESS,
|
DOWNLOAD_CONFIG_FILE_SUCCESS = _DOWNLOAD_CONFIG_FILE_SUCCESS,
|
||||||
DOWNLOAD_CONFIG_FILE_FAILURE = _DOWNLOAD_CONFIG_FILE_FAILURE,
|
DOWNLOAD_CONFIG_FILE_FAILURE = _DOWNLOAD_CONFIG_FILE_FAILURE,
|
||||||
|
DOWNLOAD_CASH_FILE = _DOWNLOAD_CASH_FILE,
|
||||||
|
DOWNLOAD_CASH_FILE_FAILURE = _DOWNLOAD_CASH_FILE_FAILURE,
|
||||||
|
DOWNLOAD_CASH_FILE_SUCCESS = _DOWNLOAD_CASH_FILE_SUCCESS,
|
||||||
|
DOWNLOAD_DEVICE_FILE = _DOWNLOAD_DEVICE_FILE,
|
||||||
|
DOWNLOAD_DEVICE_FILE_FAILURE = _DOWNLOAD_DEVICE_FILE_FAILURE,
|
||||||
|
DOWNLOAD_DEVICE_FILE_SUCCESS = _DOWNLOAD_DEVICE_FILE_SUCCESS,
|
||||||
|
DOWNLOAD_JSON_FILE = _DOWNLOAD_JSON_FILE,
|
||||||
|
DOWNLOAD_JSON_FILE_FAILURE = _DOWNLOAD_JSON_FILE_FAILURE,
|
||||||
|
DOWNLOAD_JSON_FILE_SUCCESS = _DOWNLOAD_JSON_FILE_SUCCESS,
|
||||||
DOWNLOAD_DEVICE_CONTROLLER = _DOWNLOAD_DEVICE_CONTROLLER,
|
DOWNLOAD_DEVICE_CONTROLLER = _DOWNLOAD_DEVICE_CONTROLLER,
|
||||||
DOWNLOAD_DEVICE_CONTROLLER_SUCCESS = _DOWNLOAD_DEVICE_CONTROLLER_SUCCESS,
|
DOWNLOAD_DEVICE_CONTROLLER_SUCCESS = _DOWNLOAD_DEVICE_CONTROLLER_SUCCESS,
|
||||||
DOWNLOAD_DEVICE_CONTROLLER_FAILURE = _DOWNLOAD_DEVICE_CONTROLLER_FAILURE,
|
DOWNLOAD_DEVICE_CONTROLLER_FAILURE = _DOWNLOAD_DEVICE_CONTROLLER_FAILURE,
|
||||||
@ -655,6 +674,24 @@ private:
|
|||||||
break;
|
break;
|
||||||
case UPDATE_STEP::DOWNLOAD_CONFIG_FILE_FAILURE:
|
case UPDATE_STEP::DOWNLOAD_CONFIG_FILE_FAILURE:
|
||||||
break;
|
break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_CASH_FILE: {
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_CASH_FILE_FAILURE: {
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_CASH_FILE_SUCCESS: {
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_DEVICE_FILE: {
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_DEVICE_FILE_FAILURE: {
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_DEVICE_FILE_SUCCESS: {
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_JSON_FILE: {
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE: {
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_JSON_FILE_SUCCESS: {
|
||||||
|
} break;
|
||||||
case UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER:
|
case UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER:
|
||||||
lst << instance->m_debugMsg;
|
lst << instance->m_debugMsg;
|
||||||
Utils::printUpdateStatusMsg(debug, lst);
|
Utils::printUpdateStatusMsg(debug, lst);
|
||||||
@ -1088,12 +1125,34 @@ private:
|
|||||||
case UPDATE_STEP::FILES_TO_UPDATE:
|
case UPDATE_STEP::FILES_TO_UPDATE:
|
||||||
ismasClient.setProgressInPercent(_FILES_TO_UPDATE);
|
ismasClient.setProgressInPercent(_FILES_TO_UPDATE);
|
||||||
break;
|
break;
|
||||||
case UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE:
|
case UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE: {
|
||||||
ismasClient.setProgressInPercent(_DOWNLOAD_FILES_TO_PSA_HARDWARE);
|
ismasClient.setProgressInPercent(_DOWNLOAD_FILES_TO_PSA_HARDWARE);
|
||||||
break;
|
QString const &ismasUpdateNews =
|
||||||
case UPDATE_STEP::FILES_TO_DOWNLOAD:
|
QString("#M=APISM#C=CMD_EVENT#J=") +
|
||||||
|
ismasClient.updateNewsToIsmas(
|
||||||
|
_ISMAS_CONTINUE,
|
||||||
|
ismasClient.getProgressInPercent(),
|
||||||
|
IsmasClient::RESULT_CODE::SUCCESS,
|
||||||
|
smap[UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE],
|
||||||
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
|
ismasClient.sendRequestReceiveResponse(
|
||||||
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::FILES_TO_DOWNLOAD: {
|
||||||
ismasClient.setProgressInPercent(_FILES_TO_DOWNLOAD);
|
ismasClient.setProgressInPercent(_FILES_TO_DOWNLOAD);
|
||||||
break;
|
QString const &ismasUpdateNews =
|
||||||
|
QString("#M=APISM#C=CMD_EVENT#J=") +
|
||||||
|
ismasClient.updateNewsToIsmas(
|
||||||
|
_ISMAS_CONTINUE,
|
||||||
|
ismasClient.getProgressInPercent(),
|
||||||
|
IsmasClient::RESULT_CODE::SUCCESS,
|
||||||
|
smap[UPDATE_STEP::DOWNLOAD_JSON_FILE],
|
||||||
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
|
ismasClient.sendRequestReceiveResponse(
|
||||||
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
|
} break;
|
||||||
case UPDATE_STEP::EXEC_OPKG_COMMANDS:
|
case UPDATE_STEP::EXEC_OPKG_COMMANDS:
|
||||||
ismasClient.setProgressInPercent(_EXEC_OPKG_COMMANDS);
|
ismasClient.setProgressInPercent(_EXEC_OPKG_COMMANDS);
|
||||||
break;
|
break;
|
||||||
@ -1229,15 +1288,180 @@ private:
|
|||||||
ismasClient.sendRequestReceiveResponse(
|
ismasClient.sendRequestReceiveResponse(
|
||||||
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
} break;
|
} break;
|
||||||
case UPDATE_STEP::DOWNLOAD_CONFIG_FILE:
|
case UPDATE_STEP::DOWNLOAD_CONFIG_FILE: {
|
||||||
ismasClient.setProgressInPercent(_DOWNLOAD_CONFIG_FILE);
|
//ismasClient.setProgressInPercent(_DOWNLOAD_CONFIG_FILE);
|
||||||
break;
|
ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE);
|
||||||
case UPDATE_STEP::DOWNLOAD_CONFIG_FILE_SUCCESS:
|
QString const &ismasUpdateNews =
|
||||||
ismasClient.setProgressInPercent(_DOWNLOAD_CONFIG_FILE_SUCCESS);
|
QString("#M=APISM#C=CMD_EVENT#J=") +
|
||||||
break;
|
ismasClient.updateNewsToIsmas(
|
||||||
case UPDATE_STEP::DOWNLOAD_CONFIG_FILE_FAILURE:
|
_ISMAS_CONTINUE,
|
||||||
|
ismasClient.getProgressInPercent(),
|
||||||
|
IsmasClient::RESULT_CODE::SUCCESS,
|
||||||
|
smap[UPDATE_STEP::DOWNLOAD_CONFIG_FILE],
|
||||||
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
|
ismasClient.sendRequestReceiveResponse(
|
||||||
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_CONFIG_FILE_SUCCESS: {
|
||||||
|
//ismasClient.setProgressInPercent(_DOWNLOAD_CONFIG_FILE_SUCCESS);
|
||||||
|
ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE);
|
||||||
|
QString const &ismasUpdateNews =
|
||||||
|
QString("#M=APISM#C=CMD_EVENT#J=") +
|
||||||
|
ismasClient.updateNewsToIsmas(
|
||||||
|
_ISMAS_CONTINUE,
|
||||||
|
ismasClient.getProgressInPercent(),
|
||||||
|
IsmasClient::RESULT_CODE::SUCCESS,
|
||||||
|
smap[UPDATE_STEP::DOWNLOAD_CONFIG_FILE_SUCCESS],
|
||||||
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
|
ismasClient.sendRequestReceiveResponse(
|
||||||
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_CONFIG_FILE_FAILURE: {
|
||||||
ismasClient.setProgressInPercent(_DOWNLOAD_CONFIG_FILE_FAILURE);
|
ismasClient.setProgressInPercent(_DOWNLOAD_CONFIG_FILE_FAILURE);
|
||||||
break;
|
QString const &ismasUpdateNews =
|
||||||
|
QString("#M=APISM#C=CMD_EVENT#J=") +
|
||||||
|
ismasClient.updateNewsToIsmas(
|
||||||
|
_ISMAS_CONTINUE,
|
||||||
|
ismasClient.getProgressInPercent(),
|
||||||
|
IsmasClient::RESULT_CODE::JSON_FILES_DOWNLOAD_ERROR,
|
||||||
|
smap[UPDATE_STEP::DOWNLOAD_CASH_FILE_FAILURE],
|
||||||
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
|
ismasClient.sendRequestReceiveResponse(
|
||||||
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_CASH_FILE: {
|
||||||
|
//ismasClient.setProgressInPercent(_DOWNLOAD_CASH_FILE);
|
||||||
|
ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE);
|
||||||
|
QString const &ismasUpdateNews =
|
||||||
|
QString("#M=APISM#C=CMD_EVENT#J=") +
|
||||||
|
ismasClient.updateNewsToIsmas(
|
||||||
|
_ISMAS_CONTINUE,
|
||||||
|
ismasClient.getProgressInPercent(),
|
||||||
|
IsmasClient::RESULT_CODE::SUCCESS,
|
||||||
|
smap[UPDATE_STEP::DOWNLOAD_CASH_FILE],
|
||||||
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
|
ismasClient.sendRequestReceiveResponse(
|
||||||
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_CASH_FILE_FAILURE: {
|
||||||
|
ismasClient.setProgressInPercent(_DOWNLOAD_CASH_FILE_FAILURE);
|
||||||
|
QString const &ismasUpdateNews =
|
||||||
|
QString("#M=APISM#C=CMD_EVENT#J=") +
|
||||||
|
ismasClient.updateNewsToIsmas(
|
||||||
|
_ISMAS_CONTINUE,
|
||||||
|
ismasClient.getProgressInPercent(),
|
||||||
|
IsmasClient::RESULT_CODE::JSON_FILES_DOWNLOAD_ERROR,
|
||||||
|
smap[UPDATE_STEP::DOWNLOAD_CASH_FILE_FAILURE],
|
||||||
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
|
ismasClient.sendRequestReceiveResponse(
|
||||||
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_CASH_FILE_SUCCESS: {
|
||||||
|
//ismasClient.setProgressInPercent(_DOWNLOAD_CASH_FILE_SUCCESS);
|
||||||
|
ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE);
|
||||||
|
QString const &ismasUpdateNews =
|
||||||
|
QString("#M=APISM#C=CMD_EVENT#J=") +
|
||||||
|
ismasClient.updateNewsToIsmas(
|
||||||
|
_ISMAS_CONTINUE,
|
||||||
|
ismasClient.getProgressInPercent(),
|
||||||
|
IsmasClient::RESULT_CODE::SUCCESS,
|
||||||
|
smap[UPDATE_STEP::DOWNLOAD_CASH_FILE_SUCCESS],
|
||||||
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
|
ismasClient.sendRequestReceiveResponse(
|
||||||
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_DEVICE_FILE: {
|
||||||
|
//ismasClient.setProgressInPercent(_DOWNLOAD_DEVICE_FILE);
|
||||||
|
ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE);
|
||||||
|
QString const &ismasUpdateNews =
|
||||||
|
QString("#M=APISM#C=CMD_EVENT#J=") +
|
||||||
|
ismasClient.updateNewsToIsmas(
|
||||||
|
_ISMAS_CONTINUE,
|
||||||
|
ismasClient.getProgressInPercent(),
|
||||||
|
IsmasClient::RESULT_CODE::SUCCESS,
|
||||||
|
smap[UPDATE_STEP::DOWNLOAD_DEVICE_FILE],
|
||||||
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
|
ismasClient.sendRequestReceiveResponse(
|
||||||
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_DEVICE_FILE_FAILURE: {
|
||||||
|
ismasClient.setProgressInPercent(_DOWNLOAD_DEVICE_FILE_FAILURE);
|
||||||
|
QString const &ismasUpdateNews =
|
||||||
|
QString("#M=APISM#C=CMD_EVENT#J=") +
|
||||||
|
ismasClient.updateNewsToIsmas(
|
||||||
|
_ISMAS_CONTINUE,
|
||||||
|
ismasClient.getProgressInPercent(),
|
||||||
|
IsmasClient::RESULT_CODE::JSON_FILES_DOWNLOAD_ERROR,
|
||||||
|
smap[UPDATE_STEP::DOWNLOAD_DEVICE_FILE_FAILURE],
|
||||||
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
|
ismasClient.sendRequestReceiveResponse(
|
||||||
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_DEVICE_FILE_SUCCESS: {
|
||||||
|
//ismasClient.setProgressInPercent(_DOWNLOAD_DEVICE_FILE_SUCCESS);
|
||||||
|
ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE);
|
||||||
|
QString const &ismasUpdateNews =
|
||||||
|
QString("#M=APISM#C=CMD_EVENT#J=") +
|
||||||
|
ismasClient.updateNewsToIsmas(
|
||||||
|
_ISMAS_CONTINUE,
|
||||||
|
ismasClient.getProgressInPercent(),
|
||||||
|
IsmasClient::RESULT_CODE::SUCCESS,
|
||||||
|
smap[UPDATE_STEP::DOWNLOAD_DEVICE_FILE_SUCCESS],
|
||||||
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
|
ismasClient.sendRequestReceiveResponse(
|
||||||
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_JSON_FILE: {
|
||||||
|
ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE);
|
||||||
|
QString const &ismasUpdateNews =
|
||||||
|
QString("#M=APISM#C=CMD_EVENT#J=") +
|
||||||
|
ismasClient.updateNewsToIsmas(
|
||||||
|
_ISMAS_CONTINUE,
|
||||||
|
ismasClient.getProgressInPercent(),
|
||||||
|
IsmasClient::RESULT_CODE::SUCCESS,
|
||||||
|
smap[UPDATE_STEP::DOWNLOAD_JSON_FILE],
|
||||||
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
|
ismasClient.sendRequestReceiveResponse(
|
||||||
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE: {
|
||||||
|
ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE_FAILURE);
|
||||||
|
QString const &ismasUpdateNews =
|
||||||
|
QString("#M=APISM#C=CMD_EVENT#J=") +
|
||||||
|
ismasClient.updateNewsToIsmas(
|
||||||
|
_ISMAS_CONTINUE,
|
||||||
|
ismasClient.getProgressInPercent(),
|
||||||
|
IsmasClient::RESULT_CODE::JSON_FILES_DOWNLOAD_ERROR,
|
||||||
|
smap[UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE],
|
||||||
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
|
ismasClient.sendRequestReceiveResponse(
|
||||||
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_JSON_FILE_SUCCESS: {
|
||||||
|
ismasClient.setProgressInPercent(_DOWNLOAD_JSON_FILE);
|
||||||
|
QString const &ismasUpdateNews =
|
||||||
|
QString("#M=APISM#C=CMD_EVENT#J=") +
|
||||||
|
ismasClient.updateNewsToIsmas(
|
||||||
|
_ISMAS_CONTINUE,
|
||||||
|
ismasClient.getProgressInPercent(),
|
||||||
|
IsmasClient::RESULT_CODE::SUCCESS,
|
||||||
|
smap[UPDATE_STEP::DOWNLOAD_JSON_FILE_SUCCESS],
|
||||||
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
|
ismasClient.sendRequestReceiveResponse(
|
||||||
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
|
} break;
|
||||||
case UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER:
|
case UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER:
|
||||||
ismasClient.setProgressInPercent(_DOWNLOAD_DEVICE_CONTROLLER);
|
ismasClient.setProgressInPercent(_DOWNLOAD_DEVICE_CONTROLLER);
|
||||||
break;
|
break;
|
||||||
@ -1275,9 +1499,20 @@ private:
|
|||||||
case UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE:
|
case UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE:
|
||||||
ismasClient.setProgressInPercent(_DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE);
|
ismasClient.setProgressInPercent(_DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE);
|
||||||
break;
|
break;
|
||||||
case UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY:
|
case UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY: {
|
||||||
ismasClient.setProgressInPercent(_SYNC_CUSTOMER_REPOSITORY);
|
ismasClient.setProgressInPercent(_SYNC_CUSTOMER_REPOSITORY);
|
||||||
break;
|
QString const &ismasUpdateNews =
|
||||||
|
QString("#M=APISM#C=CMD_EVENT#J=") +
|
||||||
|
ismasClient.updateNewsToIsmas(
|
||||||
|
_ISMAS_CONTINUE,
|
||||||
|
ismasClient.getProgressInPercent(),
|
||||||
|
IsmasClient::RESULT_CODE::SUCCESS,
|
||||||
|
smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY],
|
||||||
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
|
ismasClient.sendRequestReceiveResponse(
|
||||||
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
|
} break;
|
||||||
case UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS: {
|
case UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS: {
|
||||||
ismasClient.setProgressInPercent(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
|
ismasClient.setProgressInPercent(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
|
||||||
QString const &ismasUpdateNews =
|
QString const &ismasUpdateNews =
|
||||||
@ -1286,7 +1521,7 @@ private:
|
|||||||
_ISMAS_CONTINUE,
|
_ISMAS_CONTINUE,
|
||||||
ismasClient.getProgressInPercent(),
|
ismasClient.getProgressInPercent(),
|
||||||
IsmasClient::RESULT_CODE::SUCCESS,
|
IsmasClient::RESULT_CODE::SUCCESS,
|
||||||
smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY],
|
smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS],
|
||||||
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
ismasClient.sendRequestReceiveResponse(
|
ismasClient.sendRequestReceiveResponse(
|
||||||
@ -1326,24 +1561,26 @@ private:
|
|||||||
} break;
|
} break;
|
||||||
case UPDATE_STEP::UPDATE_SUCCEEDED: {
|
case UPDATE_STEP::UPDATE_SUCCEEDED: {
|
||||||
ismasClient.setProgressInPercent(_UPDATE_SUCCEEDED + _UPDATE_SUCCEEDED_CORRECTION);
|
ismasClient.setProgressInPercent(_UPDATE_SUCCEEDED + _UPDATE_SUCCEEDED_CORRECTION);
|
||||||
QString const &ismasUpdateNews =
|
if (instance->m_automaticUpdate == false) {
|
||||||
QString("#M=APISM#C=CMD_EVENT#J=") +
|
QString const &ismasUpdateNews =
|
||||||
ismasClient.updateNewsToIsmas(
|
QString("#M=APISM#C=CMD_EVENT#J=") +
|
||||||
_ISMAS_DONE, // WAIT-button set to 100%
|
ismasClient.updateNewsToIsmas(
|
||||||
ismasClient.getProgressInPercent(),
|
_ISMAS_DONE, // WAIT-button set to 100%
|
||||||
IsmasClient::RESULT_CODE::SUCCESS,
|
ismasClient.getProgressInPercent(),
|
||||||
smap[UPDATE_STEP::UPDATE_FINALIZE],
|
IsmasClient::RESULT_CODE::SUCCESS,
|
||||||
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
smap[UPDATE_STEP::UPDATE_FINALIZE],
|
||||||
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
instance->m_ismasMsg.join(' ').toStdString().c_str(),
|
||||||
ismasClient.sendRequestReceiveResponse(
|
instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A");
|
||||||
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
ismasClient.sendRequestReceiveResponse(
|
||||||
|
IsmasClient::APISM::DB_PORT, ismasUpdateNews);
|
||||||
|
}
|
||||||
} break;
|
} break;
|
||||||
case UPDATE_STEP::UPDATE_ACTIVATED: {
|
case UPDATE_STEP::UPDATE_ACTIVATED: {
|
||||||
ismasClient.setProgressInPercent(_UPDATE_ACTIVATED + _UPDATE_ACTIVATED_CORRECTION);
|
ismasClient.setProgressInPercent(_UPDATE_ACTIVATED + _UPDATE_ACTIVATED_CORRECTION);
|
||||||
QString const &ismasUpdateNews =
|
QString const &ismasUpdateNews =
|
||||||
QString("#M=APISM#C=CMD_EVENT#J=") +
|
QString("#M=APISM#C=CMD_EVENT#J=") +
|
||||||
ismasClient.updateNewsToIsmas(
|
ismasClient.updateNewsToIsmas(
|
||||||
_ISMAS_SET_WAIT_OK, // U0002
|
(instance->m_automaticUpdate ? _ISMAS_NO_UPDATE_NECESSARY : _ISMAS_SET_WAIT_OK), // U0002 or M0100
|
||||||
ismasClient.getProgressInPercent(),
|
ismasClient.getProgressInPercent(),
|
||||||
IsmasClient::RESULT_CODE::SUCCESS,
|
IsmasClient::RESULT_CODE::SUCCESS,
|
||||||
smap[UPDATE_STEP::UPDATE_FINALIZE],
|
smap[UPDATE_STEP::UPDATE_FINALIZE],
|
||||||
@ -1357,7 +1594,7 @@ private:
|
|||||||
QString const &ismasUpdateNews =
|
QString const &ismasUpdateNews =
|
||||||
QString("#M=APISM#C=CMD_EVENT#J=") +
|
QString("#M=APISM#C=CMD_EVENT#J=") +
|
||||||
ismasClient.updateNewsToIsmas(
|
ismasClient.updateNewsToIsmas(
|
||||||
_ISMAS_SET_WAIT_OK, // U0002
|
(instance->m_automaticUpdate ? _ISMAS_NO_UPDATE_NECESSARY : _ISMAS_SET_WAIT_OK), // U0002 or M0100
|
||||||
ismasClient.getProgressInPercent(),
|
ismasClient.getProgressInPercent(),
|
||||||
IsmasClient::RESULT_CODE::NO_UPDATE_NECESSARY,
|
IsmasClient::RESULT_CODE::NO_UPDATE_NECESSARY,
|
||||||
smap[UPDATE_STEP::UPDATE_FINALIZE],
|
smap[UPDATE_STEP::UPDATE_FINALIZE],
|
||||||
@ -1552,6 +1789,24 @@ private:
|
|||||||
break;
|
break;
|
||||||
case UPDATE_STEP::DOWNLOAD_CONFIG_FILE_FAILURE:
|
case UPDATE_STEP::DOWNLOAD_CONFIG_FILE_FAILURE:
|
||||||
break;
|
break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_CASH_FILE: {
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_CASH_FILE_FAILURE: {
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_CASH_FILE_SUCCESS: {
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_DEVICE_FILE: {
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_DEVICE_FILE_FAILURE: {
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_DEVICE_FILE_SUCCESS: {
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_JSON_FILE: {
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_JSON_FILE_FAILURE: {
|
||||||
|
} break;
|
||||||
|
case UPDATE_STEP::DOWNLOAD_JSON_FILE_SUCCESS: {
|
||||||
|
} break;
|
||||||
case UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER:
|
case UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER:
|
||||||
break;
|
break;
|
||||||
case UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER_SUCCESS:
|
case UPDATE_STEP::DOWNLOAD_DEVICE_CONTROLLER_SUCCESS:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user