ismas/ismas_client.cpp

@@ -393,15 +393,6 @@ QString IsmasClient::execOpkgCommand(QString const &info, QString const &version
                              version.toStdString().c_str());
 }
 
-QString IsmasClient::rsyncFile(QString const &info, QString const &version) {
-    return updateNewsToIsmas("U0010",
-                             m_progressInPercent,
-                             RESULT_CODE::SUCCESS,
-                             "RSYNC FILE",
-                             info.toStdString().c_str(),
-                             version.toStdString().c_str());
-}
-
 QString IsmasClient::updateTriggerSet(QString const &info, QString const &version) {
     return updateNewsToIsmas("U0010",
                              m_progressInPercent,

ismas/ismas_client.h

@@ -171,7 +171,6 @@ public:
     QString errorUpdateTrigger(QString const &info, QString const &version = QString());
     QString gitFetch(QString const &info, QString const &version = QString());
     QString execOpkgCommand(QString const &info, QString const &version = QString());
-    QString rsyncFile(QString const &info, QString const &version = QString());
     QString errorGitFetch(int resultCode, QString const &info, QString const &version = QString());
     QString updateOfPSAActivated(QString const &version = QString());
                                     // and update accepted

mainwindow.cpp

@@ -226,5 +226,5 @@ void MainWindow::onReplaceLast(QString text, QString suffix) {
 void MainWindow::onShowErrorMessage(QString title, QString text) {
     this->statusBar()->clearMessage();
     this->statusBar()->showMessage( // timeout: 10000
-        QString(title + " " + text).leftJustified(80, ' '), 10000);
+        QString(title + ": " + text).leftJustified(80, ' '), 10000);
 }

worker.cpp

@@ -15,7 +15,6 @@
 #include <QMessageBox>
 #include <QPushButton>
 #include <QJsonParseError>
-#include <Qt>
 
 #include <thread>
 
@@ -515,11 +514,11 @@ bool Worker::updateTriggerSet() {
 
         if (repeat > 1) {
             int const durationMs = QTime::currentTime().msecsSinceStartOfDay() - startMs;
-            QString const &msg = QString("elapsed: %1.%2s").arg(durationMs / 1000).arg(durationMs % 1000);
+            QString const &msg = QString("[%1] time: %2.%3s").arg(repeat).arg(durationMs / 1000).arg(durationMs % 1000);
             qInfo() << "REPEAT" << msg;
             emit showErrorMessage("check update trigger", msg);
         } else {
-            emit showErrorMessage("check update trigger", "");
+            emit showErrorMessage("check update trigger", QString("[%1]").arg(repeat));
         }
 
         if ((repeat % 10) == 0) {
@@ -971,7 +970,7 @@ bool Worker::syncCustomerRepositoryAndFS() {
             }
             int progress = 10;
             setProgress(progress);
-            QString const params("-vvv                    "
+            QString const params("-vv                     "
                                  "--recursive             "
                                  "--progress              "
                                  "--checksum              "
@@ -994,25 +993,8 @@ bool Worker::syncCustomerRepositoryAndFS() {
                     qInfo() << "EXECUTING CMD..." << cmd;
                     if (c.execute(m_customerRepository, QStringList() << "-c" << cmd)) {
                         QStringList result = c.getCommandResult().split('\n');
-                        QString const &p1 = "send_files mapped ";
-                        QString const &p2 = "of size";
                         for (int i = 0; i < result.size(); ++i) {
-                            QString line = result.at(i);
-                            qInfo() << line;
-
-                            // "send_files mapped etc/psa_tariff/tariff01.json of size 19339"
-                            int sendFilesAtPos = line.indexOf(p1);
-                            int ofSizeAtPos = line.indexOf(p2);
-                            if (sendFilesAtPos != -1 && ofSizeAtPos != -1) {
-                                sendFilesAtPos += p1.length();
-                                QString const &s = line.mid(sendFilesAtPos, ofSizeAtPos - sendFilesAtPos).trimmed();
-                                m_updateStatus = UpdateStatus(UPDATE_STATUS::RSYNC_FILE_SUCCESS,
-                                    QString("RSYNC FILE ") + s.split("/").last() +
-                                            " LAST-COMMIT: " + m_gc.gitLastCommit(s));
-                                IsmasClient::sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT,
-                                        QString("#M=APISM#C=CMD_EVENT#J=") +
-                                            m_ismasClient.rsyncFile(m_updateStatus.m_statusDescription, ""));
-                            }
+                            qInfo() << result.at(i);
                         }
                     } else {
                         Utils::printCriticalErrorMsg(QString("CMD ") + cmd + " FAILED: "
@@ -1363,10 +1345,6 @@ QDebug operator<< (QDebug debug, UpdateStatus status) {
         debug << QString("UPDATE_STATUS::ISMAS_RESPONSE_RECEIVED: ")
               << status.m_statusDescription;
     break;
-    case UPDATE_STATUS::RSYNC_FILE_SUCCESS:
-        debug << QString("UPDATE_STATUS::RSYNC_FILE_SUCCESS: ")
-              << status.m_statusDescription;
-    break;
     case UPDATE_STATUS::EXEC_OPKG_COMMANDS:
         debug << QString("UPDATE_STATUS::EXEC_OPKG_COMMANDS: ")
               << status.m_statusDescription;
@@ -1490,10 +1468,6 @@ QString& operator<< (QString& str, UpdateStatus status) {
         str = QString("UPDATE_STATUS::EXEC_OPKG_COMMANDS: ");
         str += status.m_statusDescription;
     break;
-    case UPDATE_STATUS::RSYNC_FILE_SUCCESS:
-        str = QString("UPDATE_STATUS::RSYNC_FILE_SUCCESS: ");
-        str += status.m_statusDescription;
-    break;
     //default:;
     }
     return str;

worker.h

@@ -41,7 +41,6 @@ enum class UPDATE_STATUS : quint8 {
     EXEC_OPKG_COMMANDS,
     RSYNC_UPDATES_FAILURE,
     RSYNC_UPDATES_SUCCESS,
-    RSYNC_FILE_SUCCESS,
     JSON_PARSE_FAILURE,
     UPDATE_PROCESS_SUCCESS,
     UPDATE_PROCESS_FAILURE,