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

to be continued on monday

Browse Source
This commit is contained in:
Gerhard Hoffmann
2023-10-22 19:44:45 +02:00
parent 81c5f8ee7e
commit 9b0f741b9b
4 changed files with 325 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
worker.cpp
View File

@@ -24,6 +24,11 @@
#include "mainwindow.h"
#include "utils.h"
#define CONSOLE() qDebug()
#define ISMAS() m_ismasClient
#define GUI() m_mainWindow
QString const Worker::UPDATE_STEP_OK(" [ ok]");
QString const Worker::UPDATE_STEP_DONE(" [done]");
QString const Worker::UPDATE_STEP_FAIL(" [FAIL]");
@@ -86,23 +91,6 @@ Worker::Worker(int customerNr,
m_apismVersion = v.value();
}
Utils::printInfoMsg("STARTING PTU-UPDATE");
qInfo() << "CURRENT TIME ..............." << QDateTime::currentDateTime().toString(Qt::ISODate);
qInfo() << "OS VERSION ................." << m_osVersion;
qInfo() << "ATBQT VERSION .............." << m_atbqtVersion;
qInfo() << "CPU SERIAL ................." << m_cpuSerial;
qInfo() << "CUSTOMER_NR ................" << m_customerNr;
qInfo() << "CUSTOMER_NR_STR ............" << m_customerNrStr;
qInfo() << "CUSTOMER_REPOSITORY_PATH ..." << m_customerRepositoryPath;
qInfo() << "CUSTOMER_REPOSITORY ........" << m_customerRepository;
qInfo() << "MACHINE_NR ................." << m_machineNr;
qInfo() << "ZONE_NR ...................." << m_zoneNr;
qInfo() << "BRANCH_NAME ................" << m_branchName;
qInfo() << "PLUGIN_NAME ................" << m_pluginName;
qInfo() << "WORKING_DIRECTORY .........." << m_workingDirectory;
qInfo() << "APISM VERSION .............." << m_apismVersion;
qInfo() << "ATB UPDATE TOOL VERSION ...." << m_atbUpdateToolVersion;
this->moveToThread(&m_workerThread);
m_workerThread.start();
@@ -400,6 +388,8 @@ void Worker::privateUpdate() {
return;
}
GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::STARTED));
m_updateProcessRunning = true;
bool sentIsmasLastVersionNotification = false;
@@ -438,7 +428,7 @@ void Worker::privateUpdate() {
}
if (continueUpdate) {
// qDebug() << UPDATE_STEP::SANITY_CHECK;
CONSOLE() << UPDATE_STEP::CHECK_SANITY;
if ((continueUpdate = customerRepository.exists()) == false) {
emit appendText("\nInitializing customer environment ...");
startProgressLoop();