UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro

@@ -109,11 +109,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
 #           the same after an rsync. They might be noy after a change of the
 #           customer-number.
 # 1.4.3   : Use global directory for device-controller interfaces.h-file.
-# 1.4.4   : Add additional debug messages when downloading json-files.
-#           Move rsyncing of the customer-repository after the actual fetching
-#           of the repository. Otherwise, the update of, for instance
-#           tariff-files, would always be a step behind.
-VERSION="1.4.4"
+VERSION="1.4.3"
 # PLANNED TODOS:
 #   1:  Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
 #   2:  Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu

UpdatePTUDevCtrl/git/git_client.cpp

@@ -316,31 +316,6 @@ std::optional<QString> GitClient::gitPull() {
                         //   6ed893f..5d9882c  zg1/zone2  -> origin/zg1/zone2
                         //   4384d17..77045d8  zg1/zone3  -> origin/zg1/zone3
                         //   89d2812..36a0d74  zg1/zone5  -> origin/zg1/zone5
-                        //
-                        // More exactly:
-                        // remote: Counting objects: 382, done.
-                        // remote: Compressing objects: 100% (203/203), done.
-                        // remote: Total 278 (delta 177), reused 103 (delta 59)
-                        // Receiving objects: 100% (278/278), 4.89 MiB | 539 KiB/s, done.
-                        // Resolving deltas: 100% (177/177), completed with 40 local objects.
-                        // From ssh://longair@pacific.mpi-cbg.de/srv/git/fiji
-                        // 3036acc..9eb5e40  debian-release-20081030 -> origin/debian-release-20081030
-                        // * [new branch]      debian-release-20081112 -> origin/debian-release-20081112
-                        // * [new branch]      debian-release-20081112.1 -> origin/debian-release-20081112.1
-                        // 3d619e7..6260626  master     -> origin/master
-                        //
-                        // The most important bits here are the lines like these:
-                        //
-                        //     3036acc..9eb5e40  debian-release-20081030 -> origin/debian-release-20081030
-                        //   * [new branch]      debian-release-20081112 -> origin/debian-release-20081112
-                        //
-                        // The first line of these two shows that your remote-tracking branch
-                        // origin/debian-release-20081030 has been advanced from the commit 3036acc to 9eb5e40.
-                        // The bit before the arrow is the name of the branch in the remote repository.
-                        // The second line similarly show that since we last did this, a new remote tracking
-                        // branch has been created. (git fetch may also fetch new tags if they have appeared
-                        // in the remote repository.)
-
                         bool found = false;
                         for (int i=0; i < lines.size(); ++i) {
                             if (lines.at(i).contains(m_branchName)) {

UpdatePTUDevCtrl/update.cpp

@@ -400,26 +400,17 @@ bool Update::downloadJson(enum FileTypeJson type,
     qDebug() << "SET AUTO-REQUEST=TRUE";
     QThread::sleep(1);  // make sure the auto-request flag is acknowledged
 
-    QStringList lst;
     bool ready = false;
     int nTry = 25;
     while ((ready = m_hw->sys_ready4sending()) == false) {
         QThread::msleep(200);
         if (--nTry <= 0) {
-            QString msg("SYS NOT READY FOR SENDING AFTER 5 SECONDS");
-            Utils::printCriticalErrorMsg(msg);
-            lst << msg;
-
-            if (m_worker) {
-                m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
-            }
+            Utils::printCriticalErrorMsg("SYS NOT READY FOR SENDING AFTER 5 SECONDS");
             break;
         }
     }
 
     bool ret = false;
-    QString msg;
-    lst.clear();
     if (ready) {
         QFile file(jsFileToSendToDC);
         QFileInfo fi(jsFileToSendToDC); // max. size of template file is 800 bytes
@@ -461,48 +452,20 @@ bool Update::downloadJson(enum FileTypeJson type,
                             qCritical() << length << "MACHINE ID =" << ba.toHex(':');
                         */
 
-                        if (m_worker) {
-                            m_worker->ISMAS(lst) << (m_worker->GUI(lst) << (m_worker->CONSOLE(lst) << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
-                        }
-
                         ret = true;
-                    } else {
-                        msg = QString("ERROR SEND JSON-FILE %1 TO DC").arg(file.fileName());
-                        Utils::printCriticalErrorMsg(msg);
-                        lst << msg;
-                        if (m_worker) {
-                            m_worker->ISMAS(lst) <<  (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
-                                                 << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
-                        }
                     }
                 } else {
-                    msg = QString("SIZE OF %1 TOO BIG (%2 BYTES)").arg(jsFileToSendToDC).arg(fi.size());
-                    Utils::printCriticalErrorMsg(msg);
-                    lst << msg;
-                    if (m_worker) {
-                        m_worker->ISMAS(lst) <<  (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
-                                             << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
-                    }
+                    Utils::printCriticalErrorMsg(
+                        QString("SIZE OF %1 TOO BIG (%2 BYTES)")
+                            .arg(jsFileToSendToDC).arg(fi.size()));
                 }
             } else {
-                msg = QString("CAN NOT OPEN ") + jsFileToSendToDC + " FOR READING";
-                Utils::printCriticalErrorMsg(msg);
-                lst << msg;
-
-                if (m_worker) {
-                    m_worker->ISMAS(lst) <<  (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
-                                         << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
-                }
+                Utils::printCriticalErrorMsg(
+                    QString("CAN NOT OPEN ") + jsFileToSendToDC + " FOR READING");
             }
         } else {
-            msg = QString(jsFileToSendToDC) + " DOES NOT EXIST";
-            Utils::printCriticalErrorMsg(msg);
-            lst << msg;
-
-            if (m_worker) {
-                m_worker->ISMAS(lst) <<  (m_worker->GUI(lst) << (m_worker->CONSOLE(lst)
-                                     << Worker::UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
-            }
+            Utils::printCriticalErrorMsg(
+                QString(jsFileToSendToDC) + " DOES NOT EXIST");
         }
     }
 

UpdatePTUDevCtrl/utils.cpp

@@ -277,24 +277,21 @@ bool Utils::sameFilesInDirs(QDir const &dir1, QDir const &dir2,
         fileNameLst2 << i2.next().fileName();
     }
 
-    QString dirPath1 = dir1.absolutePath();
-    QString dirPath2 = dir2.absolutePath();
-
     if (fileNameLst1.isEmpty()) {
-        qCritical() << "DIR1" << dirPath1 << " DOES NOT CONTAIN EXPECTED FILES";
+        qCritical() << "DIR1" << dir1.dirName() << " DOES NOT CONTAIN EXPECTED FILES";
         return false;
     }
     if (fileNameLst2.isEmpty())  {
-        qCritical() << "DIR1" << dirPath2 << " DOES NOT CONTAIN EXPECTED FILES";
+        qCritical() << "DIR1" << dir2.dirName() << " DOES NOT CONTAIN EXPECTED FILES";
         return false;
     }
     if (fileNameLst1 != fileNameLst2) {
-        printCriticalErrorMsg(dirPath1 + " AND " + dirPath2
+        printCriticalErrorMsg(dir1.dirName() + " AND " + dir2.dirName()
                             + " DIFFER: [" + fileNameLst1.join(',') + "],["
                             + fileNameLst2.join(',') + "]");
         return false;
     } else {
-        printInfoMsg(dirPath1 + " AND " + dirPath2
+        printInfoMsg(dir1.dirName() + " AND " + dir2.dirName()
                     + " ARE EQUAL: [" + fileNameLst1.join(',') + "]");
     }
 
@@ -310,21 +307,21 @@ bool Utils::sameFilesInDirs(QDir const &dir1, QDir const &dir2,
     }
 
     if (gitBlobLst1.isEmpty()) {
-        qCritical() << "DIR1" << dirPath1 << " DOES NOT CONTAIN EXPECTED FILES";
+        qCritical() << "DIR1" << dir1.dirName() << " DOES NOT CONTAIN EXPECTED FILES";
         return false;
     }
     if (gitBlobLst2.isEmpty())  {
-        qCritical() << "DIR1" << dirPath2 << " DOES NOT CONTAIN EXPECTED FILES";
+        qCritical() << "DIR1" << dir2.dirName() << " DOES NOT CONTAIN EXPECTED FILES";
         return false;
     }
 
     if (gitBlobLst1 != gitBlobLst2) {
-        printCriticalErrorMsg(dirPath1 + " AND " + dirPath2
+        printCriticalErrorMsg(dir1.dirName() + " AND " + dir2.dirName()
                             + " DIFFER: [" + gitBlobLst1.join(',') + "],["
                             + gitBlobLst2.join(',') + "]");
         return false;
     } else {
-        printInfoMsg(dirPath1 + " AND " + dirPath2
+        printInfoMsg(dir1.dirName() + " AND " + dir2.dirName()
                     + " CONTAIN SAME GIT-BLOBS FOR FILES: [" + fileNameLst1.join(',') + "]");
 
     }

UpdatePTUDevCtrl/worker.cpp

@@ -439,6 +439,17 @@ void Worker::privateUpdate() {
     ISMAS(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECKOUT_BRANCH);
     setProgress(_CHECKOUT_BRANCH_SUCCESS);
 
+    ////////////////////////////////////////////////////////////////////////////
+    //
+    //             (R)SYNC THE REPOSITORY WITH THE LOCAL FILEYSTEM
+    //
+    ////////////////////////////////////////////////////////////////////////////
+    if ((continueUpdate = syncCustomerRepositoryAndFS()) == false) {
+        return;
+    }
+    lst = QStringList(QString(smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS]));
+    ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS));
+    setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
 
     ////////////////////////////////////////////////////////////////////////////
     //
@@ -453,18 +464,6 @@ void Worker::privateUpdate() {
     ISMAS() << (GUI() << (CONSOLE() << UPDATE_STEP::UPDATE_REPOSITORY));
     setProgress(_UPDATE_REPOSITORY_SUCCESS);
 
-    ////////////////////////////////////////////////////////////////////////////
-    //
-    //             (R)SYNC THE REPOSITORY WITH THE LOCAL FILEYSTEM
-    //
-    ////////////////////////////////////////////////////////////////////////////
-    if ((continueUpdate = syncCustomerRepositoryAndFS()) == false) {
-        return;
-    }
-    lst = QStringList(QString(smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS]));
-    ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS));
-    setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
-
 
     ////////////////////////////////////////////////////////////////////////////
     //
@@ -929,7 +928,7 @@ bool Worker::downloadFilesToPSAHardware() {
                 return true;
             }
 
-            CONSOLE(lst) << (m_lastFailedUpdateStep = UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE);
+            CONSOLE(QStringList("NO FILES TO DOWNLOAD TO PSA-HW")) << (m_lastFailedUpdateStep = UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE);
             setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE);
 
             return false;

UpdatePTUDevCtrl/worker.h

@@ -225,8 +225,7 @@ class Worker : public QThread{
                     m_worker->setProgress(_FINISHED);
                 }
             } else {
-                // QStringList lst = m_worker->m_ismasTriggerStatusMessage;
-                QStringList lst;
+                QStringList lst = m_worker->m_ismasTriggerStatusMessage;
                 UPDATE_STEP last = m_worker->m_lastFailedUpdateStep;
                 if (m_worker->smap.contains(last)) {
                     lst << QString(" (last failed step: %1)").arg(m_worker->smap[last]);