OnDemandUpdatePTU.pro

@@ -65,19 +65,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # 1.3.18:   Bug fixes found during testing.
 # 1.3.19:   Bug fixes found during testing.
 # 1.3.20:   Bug fixes found during testing.
-# 1.3.21:   Bug fixes found during testing:
+VERSION="1.3.21"
-#           Fix directory of ATBUpdateTool.ini to be the working directory of
-#           the application rather than just ".".
-#           Check existance of etc-directory inside customer repository.
-#           Check for valid ISMAS trigger (button) 15x (=90s).
-#           NOTE: if the customer repository is cloned (or repaired and cloned
-#           again), and if the settings always-download-config=true and
-#           always-download-dc=true in the ATBUpdateTool.ini file, the download
-#           the printer-json files and the device controller file, even without
-#           an activated ISMAS trigger (button). The tariff-files are rsynced to
-#           the local filesystem for such clone.
-#           Set new filename for device controller: dc2c.bin.
-VERSION="1.3.22"
 
 # PLANNED TODOS:
 #   1:  Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.

commandline_parser.cpp

@@ -87,7 +87,7 @@ void CommandLineParser::configure() {
     m_repositoryUrlOption.setDefaultValue("https://git.mimbach49.de/GerhardHoffmann");
     m_parser.addOption(m_repositoryUrlOption);
 
-    m_iniFileDirectoryOption.setDefaultValue(QCoreApplication::applicationDirPath());
+    m_iniFileDirectoryOption.setDefaultValue(".");
     m_parser.addOption(m_iniFileDirectoryOption);
 
     m_iniFileNameOption.setDefaultValue("ATBUpdateTool.ini");
@@ -128,6 +128,7 @@ 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);
+
     if (!m_iniFileName.isEmpty()) {
         if (QFile(m_iniFileName).exists()) {
             QSettings settings(m_iniFileName, QSettings::IniFormat);

mainwindow.cpp

@@ -146,7 +146,7 @@ void MainWindow::onEnableExit() {
 
 void MainWindow::onRestartExitTimer() {
     m_exitTimer->stop();
-    m_exitTimer->start(5 * 1000);
+    m_exitTimer->start(60 * 1000);
 
     scrollDownTextEdit();
     ui->updateStatus->setEnabled(false);

update.cpp

@@ -505,7 +505,8 @@ bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
     for (it = filesToWorkOn.cbegin(); it != filesToWorkOn.cend(); ++it) {
         m_worker->startProgressLoop();
         QString const &fToWorkOn = QDir::cleanPath(m_customerRepository + QDir::separator() + it->trimmed());
-        if (fToWorkOn.contains("dc2c.bin")) {
+        static const QRegularExpression version("^.*dc2c[.][0-9]{1,2}[.][0-9]{1,2}[.]bin.*$");
+        if (fToWorkOn.contains(version)) {
             bool updateBinaryRes = true;
 
             // CONSOLE()
@@ -595,6 +596,8 @@ bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
             qCritical() << "UNKNOWN JSON FILE NAME" << fToWorkOn;
             res = false;
         }
+        // m_worker->stopProgressLoop();
+        // m_worker->setProgress(100);
 
         if (res == false) {
             break;

worker.cpp

@@ -214,12 +214,6 @@ bool Worker::isRepositoryCorrupted() {
             Utils::printCriticalErrorMsg("CORRUPTED CUSTOMER REPOSITORY .GIT DOES NOT EXIST");
             return true;
         }
-        QDir customerRepositoryEtc(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/"));
-        if (!customerRepositoryEtc.exists()) {
-            // should never happen
-            Utils::printCriticalErrorMsg(QString("CORRUPTED CUSTOMER REPOSITORY %1/etc DOES NOT EXIST").arg(m_customerRepository));
-            return true;
-        }
     }
     return false;
 }
@@ -340,30 +334,21 @@ void Worker::privateUpdate() {
     //
     ////////////////////////////////////////////////////////////////////////////
     m_ismasTriggerActive = false;
-    if (m_clone == false) {
     if ((continueUpdate = updateTriggerSet()) == false) {
-            return;
-        } else {
-            GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::CHECK_ISMAS_TRIGGER_SUCCESS));
-            setProgress(_CHECK_ISMAS_TRIGGER_SUCCESS);
-        }
-    } else {
         if (m_initialClone) {
             GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::INITIAL_CLONE_WITHOUT_ACTIVE_ISMAS_TRIGGER));
         }
+        return;
+    } else {
+        GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER));
     }
-
-    qCritical() << "**** m_ismasTriggerActive:" << m_ismasTriggerActive;
-    qCritical() << "****              m_clone:" << m_clone;
-
     if (m_ismasTriggerActive == false) {// make it explicit again: only if the
                                         // ismas trigger is active ('WAIT'),
                                         // then proceed
-
+        return;
-        if (m_clone == false) {  // if it is an (initial) clone, then
+    }
-            return;              // run the whole update process:
+    GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::CHECK_ISMAS_TRIGGER_SUCCESS));
-        }                        // sync tariff-files, download jsons,
+    setProgress(_CHECK_ISMAS_TRIGGER_SUCCESS);
-    }                            // download device controller
 
 
     ////////////////////////////////////////////////////////////////////////////
@@ -473,8 +458,8 @@ bool Worker::updateTriggerSet() {
     GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::CHECK_ISMAS_TRIGGER));
 
     QString triggerValue("NOT CHECKED YET");
-    static constexpr int const repeats = 15;
+
-    for (int repeat = 1; repeat <= repeats; ++repeat) {
+    for (int repeat = 1; repeat <= 100; ++repeat) {
 
         if (repeat > 1) {
             int const startMs = QTime::currentTime().msecsSinceStartOfDay();
@@ -482,12 +467,10 @@ bool Worker::updateTriggerSet() {
             QString const &s = QString("elapsed: %1.%2s").arg(durationMs / 1000).arg(durationMs % 1000);
             CONSOLE(QStringList(func) << s) << UPDATE_STEP::DEBUG;
         } else {
-            QStringList lst = (QStringList(func) << QString("-> REPEAT=%1 (%2)").arg(repeat).arg(repeats-repeat));
+            CONSOLE(QStringList(func) << QString("-> REPEAT=%1").arg(repeat)) << UPDATE_STEP::DEBUG;
-            // GUI(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER;
-            CONSOLE(lst) << UPDATE_STEP::DEBUG;
         }
 
-        if ((repeat % 8) == 0) {
+        if ((repeat % 10) == 0) {
             CONSOLE(QStringList(func) << "RESTART APISM") << UPDATE_STEP::DEBUG;
             Command c("systemctl restart apism");
             if (c.execute("/tmp")) {
@@ -577,7 +560,7 @@ bool Worker::updateTriggerSet() {
                             return m_ismasTriggerActive;
                         } else
                         if (QRegExp("\\s*").exactMatch(triggerValue)) { // check for whitespace
-                            QStringList lst(QString("%1 empty update trigger (%2)").arg(repeat).arg(repeats-repeat));
+                            QStringList lst("empty update trigger");
                             if (m_clone) {
                                 GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE);
                                                     // if the customer repository has just been cloned
@@ -659,7 +642,10 @@ bool Worker::filesToUpdate() {
     // always execute contents of opkg_commands-file
     m_filesToUpdate << "etc/psa_update/opkg_commands";
 
-    if (m_clone && m_alwaysDownloadConfig) {
+    if (m_alwaysDownloadConfig) {
+#if 0
+        QStringList lst(QString("m_alwaysDownloadConfig NOT TESTED"));
+        CONSOLE(lst) << UPDATE_STEP::UPDATE_REPOSITORY;
         // always download all json-config files, even if none of them have been
         // changed in the git repository. useful for first installation.
         QDir dir(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_config"));
@@ -669,19 +655,24 @@ bool Worker::filesToUpdate() {
                 m_filesToUpdate << jsons;
             }
         }
+#endif
     }
 
-    if (m_clone && m_alwaysDownloadDC) {
+    if (m_alwaysDownloadDC) {
+#if 0
+        QStringList lst(QString("m_alwaysDownloadDC NOT TESTED"));
+        CONSOLE(lst) << UPDATE_STEP::UPDATE_REPOSITORY;
         // always download the last dc-binary, even if not changed in the
         // git repository. useful for first installation.
-        QDir dir(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/dc"));
+        QDir dir(QDir::cleanPath(m_customerRepository + QDir::separator() + "etc/psa_update"));
         if (dir.exists()) {
-            QStringList dc = dir.entryList(QStringList() << "dc2c.bin", QDir::Files,
+            QStringList dc = dir.entryList(QStringList() << "dc2c*.bin", QDir::Files,
                                            QDir::SortFlag::Time | QDir::SortFlag::Reversed);
             if (!dc.isEmpty()) {
                 m_filesToUpdate << dc.first();
             }
         }
+#endif
     }
 
     if (std::optional<QString> changes = m_gc.gitPull()) {
@@ -714,7 +705,8 @@ bool Worker::computeFilesToDownload() {
             fName.contains("DC2C_cash", Qt::CaseInsensitive)) {
             m_filesToDownload << fName;  // download printer-config-files
         } else {
-            if (fName.contains("dc2c.bin")) {
+            static const QRegularExpression version("^.*dc2c[.][0-9]{1,2}[.][0-9]{1,2}[.]bin.*$");
+            if (fName.contains(version)) {
                 m_filesToDownload << fName; // download device controller
             }
         }
@@ -856,7 +848,7 @@ bool Worker::syncCustomerRepositoryAndFS() {
                             QStringList() << "-c" << "mkdir -p /etc/psa_config /etc/dc /etc/psa_tariff")) {
                 qCritical() << "COULD NOT EXECUTE '" << md.command() << "' exitCode=(" << md.exitCode() << ")";
             }
-            QString const params("-v                      "
+            QString const params("-vvv                    "
                                  "--recursive             "
                                  "--progress              "
                                  "--checksum              "

worker.h

@@ -1127,9 +1127,6 @@ private:
         break;
         case UPDATE_STEP::CHECK_ISMAS_TRIGGER:
             emit worker->appendText("\n" CHECK_UPDATE_TRIGGER_SET);
-            if (worker->m_guiMsg.size() > 0) {
-                emit worker->showStatusMessage(worker->m_guiMsg);
-            }
         break;
         case UPDATE_STEP::CHECK_ISMAS_TRIGGER_SUCCESS:
         break;