Minor: add comment

QString getLocation(QString fileName);
    QString getTariffVersion(QString fileName);
    QString getTariffInfo(QString fileName);

Read project location, tariff location and tariff-info
from tariff[].json file.

ATBUpdateTool.ini

@@ -6,7 +6,7 @@ plugin-directory="/usr/lib/"
 working-directory="/opt/app/tools/atbupdate/"
 
 [PLUGINS]
-plugin-name="libCAmaster.so"
+plugin-name="libCAslave.so"
 
 [FLAGS]
 no-psa-hardware-update=false

OnDemandUpdatePTU.pro

@@ -92,7 +92,10 @@ DEFINES += QT_DEPRECATED_WARNINGS
 #           Changes:
 #               (1) the ini-File now uses the libCAmaster.so.
 # 1.3._25_: Again special version for szeged, using interface.h, version 4.4.
-VERSION="1.3._25_"
+# 1.4.0   : Start with version at 1.4.0 (mainly to see a difference with Szeged)
+#           Set hash-value in EVENT-objects. Set location (project), version
+#           and info in send-last-version.
+VERSION="1.4.0"
 
 # PLANNED TODOS:
 #   1:  Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
@@ -179,7 +182,7 @@ DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
 # keep comments, as /* fall through */
 QMAKE_CXXFLAGS += -C
 QMAKE_CXXFLAGS += -g
-QMAKE_CXXFLAGS += -Wno-deprecated-copy
+QMAKE_CXXFLAGS += -Wno-deprecated-copy -O
 
 contains( CONFIG, PTU5 ) {
     greaterThan(QT_MAJOR_VERSION, 4): QT += serialport

commandline_parser.cpp

@@ -128,20 +128,12 @@ void CommandLineParser::readSettings() {
     QString const iniFileDir = m_parser.value(m_iniFileDirectoryOption);
     QString const iniFileName = m_parser.value(m_iniFileNameOption);
     m_iniFileName = QDir::cleanPath(iniFileDir + QDir::separator() + iniFileName);
-
-    qCritical() << __PRETTY_FUNCTION__ << " iniFileDir" << iniFileDir;
-    qCritical() << __PRETTY_FUNCTION__ << "iniFileName" << m_iniFileName;
-
     if (!m_iniFileName.isEmpty()) {
         if (QFile(m_iniFileName).exists()) {
             QSettings settings(m_iniFileName, QSettings::IniFormat);
             QStringList keys = settings.allKeys();
             for (QString const &key: keys) {
                 QVariant v = settings.value(key);
-
-                qCritical() << __PRETTY_FUNCTION__
-                            << key << " -> " << v.toString();
-
                 if (key.contains("repository-url")) {
                     m_repositoryUrl = v.toString();
                 } else
@@ -174,14 +166,8 @@ void CommandLineParser::readSettings() {
                 } else
                 if (key.contains("plugin-name")) {
                     m_plugInName = v.toString();
-                } else {
-                    qCritical() << __PRETTY_FUNCTION__
-                                << key << " -> (UNKNOWN) " << v.toString();
                 }
             }
-        } else {
-            qCritical() << __PRETTY_FUNCTION__ << "iniFileName" << m_iniFileName
-                        << "DOES NOT EXIST";
         }
     }
 }
@@ -252,9 +238,7 @@ bool CommandLineParser::extendedVersion() {
 bool CommandLineParser::alwaysDownloadConfig() {
     if (m_parser.isSet(m_alwaysDownloadConfigOption)) {
         m_alwaysDownloadConfig = m_parser.value(m_alwaysDownloadConfigOption);
-        qCritical() << "m_alwaysDownloadConfigOption IS SET" << m_alwaysDownloadConfig;
     }
-    qCritical() << "m_alwaysDownloadConfig" << m_alwaysDownloadConfig;
     return m_alwaysDownloadConfig == "false" ? false : true;
 }
 

update.cpp

@@ -54,10 +54,6 @@ hwinf *Update::loadDCPlugin(QDir const &plugInDir, QString const &fname) {
                 qCritical() << pluginLoader.errorString();
                 exit(-1);
             }
-
-            qCritical() << "loadDCPlugin() plugin directory:" << plugInDir.absolutePath();
-            qCritical() << "loadDCPlugin() plugin file name:" << pluginLoader.fileName();
-
             if (!pluginLoader.isLoaded()) {
                 qCritical() << pluginLoader.errorString();
                 exit(-2);
@@ -122,18 +118,18 @@ Update::Update(Worker *worker,
     , m_dryRun(dryRun)
     , m_sys_areDCdataValid(false) {
 
-    //int tries = 20;
-    //while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) {
+    int tries = 20;
+    while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) {
         // must deliver 'true', only then are all data from hwapi valid
-    //    if (--tries < 0) {
-    //        qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED";
-    //        break;
-    //    }
-    //    m_hw->dc_autoRequest(true);
-    //    QThread::msleep(500);
-    //}
+        if (--tries < 0) {
+            qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED";
+            break;
+        }
+        m_hw->dc_autoRequest(true);
+        QThread::msleep(500);
+    }
 
-    //qCritical() << "UPDATE: m_sys_areDCDataValid ..." << m_sys_areDCdataValid;
+    qCritical() << "UPDATE: m_sys_areDCDataValid ..." << m_sys_areDCdataValid;
 
     //qInfo() << "UPDATE: m_serialInterface    ..." << m_serialInterface;
     //qInfo() << "UPDATE: m_baudrate           ..." << m_baudrate;
@@ -266,7 +262,6 @@ bool Update::updateBinary(QString const &fileToSendToDC) {
 
     return false;
 
-#if 0
     QFile fn(fileToSendToDC);
     if (!fn.exists()) {
         // output via CONSOLE() etc
@@ -335,7 +330,6 @@ bool Update::updateBinary(QString const &fileToSendToDC) {
     }
 
     return true;
-#endif
 }
 
 QString Update::jsonType(enum FileTypeJson type) {
@@ -563,7 +557,7 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
         }
 
         if (jsonNr != 0) {
-#if 0
+
             m_hw->sys_requestJsonVersions(jsonNr);
             QThread::msleep(500);
 
@@ -581,8 +575,6 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
             if (installedVersion == fileVersion) {
 
             }
-#endif
-
         } else {
             qCritical() << "CANNOT FIND JSON-NR FOR" << jsonFileNames[i];
         }
@@ -592,10 +584,10 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
 }
 
 bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
-    //if (m_sys_areDCdataValid == false) {
-    //    qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED";
-    //    return false;
-    //}
+    if (m_sys_areDCdataValid == false) {
+        qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED";
+        return false;
+    }
 
     bool res = false;
     QList<QString>::const_iterator it;

utils.cpp

@@ -30,6 +30,82 @@ int Utils::read1stLineOfFile(QString fileName) {
     return -1;
 }
 
+QString Utils::getLocation(QString fileName) {
+    QString location("N/A");
+    QFile f(fileName);
+    if (f.exists()) {
+        if (f.open(QIODevice::ReadOnly | QIODevice::Text)) {
+            QTextStream in(&f);
+            in.setCodec("UTF-8");
+            while(!in.atEnd()) {
+                QString const &line = in.readLine();
+                if (line.indexOf("Project", Qt::CaseInsensitive) != -1) {
+                    int const c = line.indexOf(":");
+                    if (c != -1) {
+                        location = line.mid(c+1);
+                        if (!location.isEmpty()) {
+                            return location.replace(QChar('"'), QString("")).trimmed();
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    return location;
+}
+
+QString Utils::getTariffVersion(QString fileName) {
+    QString version("N/A");
+    QFile f(fileName);
+    if (f.exists()) {
+        if (f.open(QIODevice::ReadOnly | QIODevice::Text)) {
+            QTextStream in(&f);
+            in.setCodec("UTF-8");
+            while(!in.atEnd()) {
+                QString const &line = in.readLine();
+                if (line.indexOf("Version", Qt::CaseInsensitive) != -1) {
+                    int const c = line.indexOf(":");
+                    if (c != -1) {
+                        version = line.mid(c+1);
+                        if (!version.isEmpty()) {
+                            return version.replace(QChar('"'), QString("")).trimmed();
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    return version;
+}
+
+QString Utils::getTariffInfo(QString fileName) {
+    QString info("N/A");
+    QFile f(fileName);
+    if (f.exists()) {
+        if (f.open(QIODevice::ReadOnly | QIODevice::Text)) {
+            QTextStream in(&f);
+            in.setCodec("UTF-8");
+            while(!in.atEnd()) {
+                QString const &line = in.readLine();
+                if (line.indexOf("Info", Qt::CaseInsensitive) != -1) {
+                    int const c = line.indexOf(":");
+                    if (c != -1) {
+                        info = line.mid(c+1);
+                        if (!info.isEmpty()) {
+                            return info.replace(QChar('"'), QString("")).trimmed();
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    return info;
+
+}
+
 QString Utils::zoneName(quint8 i) {
     static constexpr char const *zName[] = {
         "",

utils.h

@@ -12,6 +12,9 @@
 
 namespace Utils {
     int read1stLineOfFile(QString fileName);
+    QString getLocation(QString fileName);
+    QString getTariffVersion(QString fileName);
+    QString getTariffInfo(QString fileName);
     QString zoneName(quint8 i);
     void printCriticalErrorMsg(QString const &errorMsg, bool upper=false, bool lower=false);
     void printCriticalErrorMsg(QStringList const &errorMsg);

worker.cpp

@@ -140,6 +140,7 @@ Worker::Worker(int customerNr,
   , m_serialInterface(serialInterface)
   , m_baudrate(baudrate)
   , m_gc(m_customerNrStr, m_customerRepository, m_workingDirectory, m_branchName, this)
+  , m_versionInfo(QStringList())
   , m_osVersion(getOsVersion())
   , m_atbqtVersion(getATBQTVersion())
   , m_atbUpdateToolVersion(getATBUpdateToolVersion())
@@ -301,6 +302,9 @@ void Worker::privateUpdate() {
                 setProgress(i);             // and switch to branch
                 if (m_gc.gitCloneAndCheckoutBranch()) {
                     if (!isRepositoryCorrupted()) {
+                        if (m_versionInfo.size() == 0) {
+                            m_versionInfo = m_gc.gitShowReason(m_branchName);
+                        }
                         GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::CLONE_REPOSITORY_SUCCESS));
                         continueUpdate = true;
                         m_clone = true;
@@ -330,6 +334,11 @@ void Worker::privateUpdate() {
             }
         }
     }
+
+    if (m_versionInfo.size() == 0) {
+        m_versionInfo = m_gc.gitShowReason(m_branchName);
+    }
+
     CONSOLE() << UPDATE_STEP::CHECK_REPOSITORY_SUCCESS;
     setProgress(_CHECKOUT_REPOSITORY_SUCCESS);
 
@@ -1118,15 +1127,14 @@ PSAInstalled Worker::getPSAInstalled() {
     QString absPathName;
     QString absPathNameRepository;
 
-    psaInstalled.versionInfo.lastCommit = "";
-    psaInstalled.versionInfo.reason = "";
-    psaInstalled.versionInfo.created = "";
+    psaInstalled.versionInfo.lastCommit = "N/A";
+    psaInstalled.versionInfo.reason = "N/A";
+    psaInstalled.versionInfo.created = "N/A";
 
-    QStringList versionInfo = m_gc.gitShowReason(m_branchName);
-    if (versionInfo.size() == 3) {
-        psaInstalled.versionInfo.lastCommit = versionInfo.at(0);
-        psaInstalled.versionInfo.reason = versionInfo.at(1);
-        psaInstalled.versionInfo.created = versionInfo.at(2);
+    if (m_versionInfo.size() == 3) {
+        psaInstalled.versionInfo.lastCommit = m_versionInfo.at(0);
+        psaInstalled.versionInfo.reason = m_versionInfo.at(1);
+        psaInstalled.versionInfo.created = m_versionInfo.at(2);
     }
 
     if (m_zoneNr != 0) {
@@ -1139,10 +1147,10 @@ PSAInstalled Worker::getPSAInstalled() {
         psaInstalled.tariff.size = getFileSize(absPathName);
         psaInstalled.tariff.zone = m_zoneNr;
         psaInstalled.tariff.loadTime = Utils::getTariffLoadTime(absPathName);
+        psaInstalled.tariff.project = Utils::getLocation(absPathName);
+        psaInstalled.tariff.version = Utils::getTariffVersion(absPathName);
+        psaInstalled.tariff.info = Utils::getTariffInfo(absPathName);
     }
-    psaInstalled.tariff.project = "Szeged";
-    psaInstalled.tariff.info = "N/A";
-    psaInstalled.tariff.version = "N/A";
 
     psaInstalled.hw.linuxVersion = getOsVersion();
     psaInstalled.hw.cpuSerial = m_cpuSerial;

worker.h

@@ -132,6 +132,7 @@ class Worker : public QThread{
     QString const m_baudrate;
     IsmasClient m_ismasClient;
     GitClient m_gc;
+    QStringList m_versionInfo;
     QString const m_osVersion;
     QString const m_atbqtVersion;
     QString const m_atbUpdateToolVersion;
@@ -652,8 +653,10 @@ private:
             ismasClient.setProgressInPercent(_CHECK_REPOSITORY);
         break;
         case UPDATE_STEP::CHECK_REPOSITORY_SUCCESS:
+            ismasClient.setProgressInPercent(_CHECK_REPOSITORY_SUCCESS);
         break;
         case UPDATE_STEP::CHECK_REPOSITORY_FAILURE:
+            ismasClient.setProgressInPercent(_CHECK_REPOSITORY_FAILURE);
         break;
         case UPDATE_STEP::CHECK_SANITY:
             ismasClient.setProgressInPercent(_CHECK_SANITY);
@@ -665,8 +668,10 @@ private:
             ismasClient.setProgressInPercent(_CHECK_SANITY_FAILURE);
         break;
         case UPDATE_STEP::REPOSITORY_RECOVERED_SUCCESS:
+            ismasClient.setProgressInPercent(_REPOSITORY_RECOVERED_SUCCESS);
         break;
         case UPDATE_STEP::REPOSITORY_RECOVERED_FAILURE:
+            ismasClient.setProgressInPercent(_REPOSITORY_RECOVERED_FAILURE);
         break;
         case UPDATE_STEP::CLONE_REPOSITORY:
             ismasClient.setProgressInPercent(_CLONE_REPOSITORY);
@@ -683,7 +688,7 @@ private:
                         QString("CLONED REPOSITORY %1 AND CHECKED OUT BRANCH %2")
                             .arg(instance->m_customerRepository)
                             .arg(instance->m_gc.branchName()).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;
@@ -699,7 +704,7 @@ private:
                         QString("CLONING REPOSITORY %1 OR CHECKING OUT BRANCH %2 FAILED")
                             .arg(instance->m_customerRepository)
                             .arg(instance->m_gc.branchName()).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;
@@ -713,7 +718,8 @@ private:
                     ismasClient.cloneAndCheckoutCustomerRepository(
                           QString("CHECKED OUT REPOSITORY %1 AND CHECKED OUT BRANCH %2")
                             .arg(instance->m_customerRepository)
-                            .arg(instance->m_gc.branchName())));
+                            .arg(instance->m_gc.branchName()),
+                        instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"));
         break;
         case UPDATE_STEP::CHECKOUT_REPOSITORY_FAILURE:
             ismasClient.setProgressInPercent(_CHECKOUT_REPOSITORY_FAILURE);
@@ -725,7 +731,8 @@ private:
             ismasClient.setProgressInPercent(_CHECK_ISMAS_TRIGGER_SUCCESS);
             ismasClient.sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT,
                 QString("#M=APISM#C=CMD_EVENT#J=") +
-                         ismasClient.updateTriggerSet("ISMAS TRIGGER SET", ""));
+                         ismasClient.updateTriggerSet("ISMAS TRIGGER SET",
+                            instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"));
         break;
         case UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE:
             ismasClient.setProgressInPercent(_CHECK_ISMAS_TRIGGER_WRONG_VALUE);
@@ -740,7 +747,7 @@ private:
                         IsmasClient::RESULT_CODE::INSTALL_ERROR,
                         smap[step],
                         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;
@@ -763,7 +770,7 @@ private:
                         IsmasClient::RESULT_CODE::SUCCESS,
                         smap[step],
                         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;
@@ -777,7 +784,7 @@ private:
                         IsmasClient::RESULT_CODE::INSTALL_ERROR,
                         smap[step],
                         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;
@@ -911,7 +918,7 @@ private:
                         IsmasClient::RESULT_CODE::SUCCESS,
                         smap[step],
                         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;
@@ -928,7 +935,7 @@ private:
                         IsmasClient::RESULT_CODE::INSTALL_ERROR,
                         smap[step],
                         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;
@@ -954,7 +961,7 @@ private:
                         IsmasClient::RESULT_CODE::SUCCESS,
                         smap[step],
                         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;
@@ -971,7 +978,7 @@ private:
                         IsmasClient::RESULT_CODE::SUCCESS,
                         smap[step],
                         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;
@@ -991,7 +998,7 @@ private:
                         IsmasClient::RESULT_CODE::SUCCESS,
                         smap[step],
                         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;
@@ -1011,7 +1018,7 @@ private:
                         IsmasClient::RESULT_CODE::SUCCESS,
                         smap[step],
                         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;
@@ -1034,7 +1041,7 @@ private:
                         IsmasClient::RESULT_CODE::SUCCESS,
                         smap[step],
                         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;
@@ -1048,7 +1055,7 @@ private:
                         IsmasClient::RESULT_CODE::SUCCESS,
                         smap[step],
                         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;
@@ -1062,7 +1069,7 @@ private:
                         IsmasClient::RESULT_CODE::INSTALL_ERROR,
                         smap[step],
                         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;