set verion to 1.5.6

Add status timer, to show proceeding update, so user does not exit
	application / restart machine.

UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro

@@ -141,7 +141,13 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # 1.5.1   : Fix: do not use cleanPath() on a url-address.
 # 1.5.2   : Remove .ipk and .gz files in /var/cache/opkg.
 # 1.5.3   : Build customer_(id) name without right justification.
-VERSION="1.5.3"
+# 1.5.4   : Try to run opkg-commands even under some error conditions (failure
+#           of customerEnvironment(), filesToUpdate() or
+#           syncCustomerRepositoryAndFS().
+# 1.5.5   : Call into binary ptuPackageVersion to get installed package
+#           versions.
+# 1.5.6   : Show additional update progress info in status bar.
+VERSION="1.5.6"
 # 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/ismas/ismas_client.cpp

@@ -690,7 +690,8 @@ QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) {
                 "\"libTCP_ZVT_CCPlugin.so\" : {"
                     "\"VERSION\" : \"%s\""
                 "}"
-            "}"
+            "},"
+             "\"PTU-PACKAGE-VERSIONS\" : %s"
         "}",
         psa.versionInfo.reason.toStdString().c_str(),
         psa.versionInfo.created.toStdString().c_str(),
@@ -801,7 +802,9 @@ QString IsmasClient::updateOfPSASendVersion(PSAInstalled const &psa) {
         psa.pluginVersion.mobilisisCalculatePriceConfigUi.toStdString().c_str(),
         psa.pluginVersion.prmCalculatePrice.toStdString().c_str(),
         psa.pluginVersion.prmCalculatePriceConfigUi.toStdString().c_str(),
-        psa.pluginVersion.tcpZVT.toStdString().c_str());
+        psa.pluginVersion.tcpZVT.toStdString().c_str(),
+
+        psa.ptuPackageVersion.toStdString().c_str());
 
         qInfo() << buf;
 

UpdatePTUDevCtrl/ismas/ismas_client.h

@@ -77,6 +77,8 @@ struct PSAInstalled {
 
     DC2C print[32];
 
+    QString ptuPackageVersion;
+
     explicit PSAInstalled() {
         tariff.name = "N/A";
         tariff.version = "N/A";

UpdatePTUDevCtrl/mainwindow.cpp

@@ -59,6 +59,24 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
     m_exitTimer->setSingleShot(true);
     m_exitTimer->start(1800 * 1000);
 
+    m_statusTimer = new QTimer(this);
+    if (m_statusTimer) {
+        connect(m_statusTimer, &QTimer::timeout, [this]() {
+            static QString p(".");
+            QTime const &t = QDateTime::currentDateTime().time();
+            QString s = t.toString(Qt::ISODate);
+            s += ": Update might take several minutes " + p;
+            if (p.length() >= 5) {
+                p = ".";
+            } else {
+                p += ".";
+            }
+            this->statusBar()->showMessage(s);
+        });
+        m_statusTimer->setSingleShot(false);
+        m_statusTimer->start(1000);
+    }
+
     connect(ui->exit, SIGNAL(clicked()),this,SLOT(onQuit()));
     connect(m_worker, SIGNAL(disableExit()),this,SLOT(onDisableExit()));
     connect(m_worker, SIGNAL(enableExit()),this,SLOT(onEnableExit()));
@@ -76,6 +94,7 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
 MainWindow::~MainWindow() {
     delete m_startTimer;
     delete m_exitTimer;
+    delete m_statusTimer;
     delete ui;
 }
 

UpdatePTUDevCtrl/mainwindow.h

@@ -73,5 +73,6 @@ private:
     bool m_progressRunning;
     //int m_progressValue;
     UpdateDcEvent::UpdateStep m_updateStep;
+    QTimer *m_statusTimer;
 };
 #endif // MAINWINDOW_H

UpdatePTUDevCtrl/worker.cpp

@@ -18,6 +18,7 @@
 #include <Qt>
 #include <QScopedPointer>
 #include <QRegularExpression>
+#include <QJsonArray>
 
 #include "message_handler.h"
 #include <DeviceController/interfaces.h>
@@ -1461,5 +1462,41 @@ PSAInstalled Worker::getPSAInstalled() {
         }
     }
 
+    psaInstalled.ptuPackageVersion = "{}";
+    if (QFile::exists("/usr/bin/ptuPackageVersions")) {
+        Command c("/usr/bin/ptuPackageVersions -i -o json");
+        if (c.execute(m_workingDirectory)) {
+            QString r = c.getCommandResult();
+            // ptuPackageVersions returns a json-array
+            QJsonArray const &ja = QJsonDocument::fromJson(r.remove(QRegExp("\\n")).toUtf8()).array();
+            if (!ja.empty()) {
+                // transform the array into an object, containing the objects
+                // of the array (christian needs it this way)
+                QJsonObject o;
+                foreach (QJsonValue const &value, ja) {
+                    if (value.isObject()) {
+                        QJsonObject obj = value.toObject();
+                        QStringList keys = obj.keys();
+                        if (!keys.isEmpty()) {
+                            QString const &k = obj.keys().first();
+                            QJsonValue const &v = obj.value(k);
+                            o.insert(k, v);
+                        }
+                    }
+                }
+
+                psaInstalled.ptuPackageVersion =
+                    QJsonDocument(o).toJson(QJsonDocument::Compact);
+
+            } else {
+                qCritical() << __func__ << ":" << __LINE__
+                            << "ERROR array return by ptuPackageVersions empty";
+            }
+        } else {
+            qCritical() << __func__ << ":" << __LINE__
+                        << "ERROR executing ptuPackageVersions";
+        }
+    }
+
     return psaInstalled;
 }