From b25b66395fda5fcc09b02ad08c0562ff95142c67 Mon Sep 17 00:00:00 2001
From: Gerhard Hoffmann <g.hoffmann@atb-online.eu>
Date: Tue, 18 Feb 2025 14:56:13 +0100
Subject: [PATCH] Support for ATBUpdateOpkg

---
 .../process/exec_opkg_command.cpp             | 67 +++++++++++++++++--
 UpdatePTUDevCtrl/process/exec_opkg_command.h  |  3 +
 2 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/UpdatePTUDevCtrl/process/exec_opkg_command.cpp b/UpdatePTUDevCtrl/process/exec_opkg_command.cpp
index 9c49a7f..7bea7fc 100644
--- a/UpdatePTUDevCtrl/process/exec_opkg_command.cpp
+++ b/UpdatePTUDevCtrl/process/exec_opkg_command.cpp
@@ -1,5 +1,8 @@
 #include "process/exec_opkg_command.h"
 #include "worker.h"
+#include "utils_internal.h"
+
+#include <QStringList>
 
 ExecOpkgCommand::ExecOpkgCommand(QString const &command,
                                  Worker *worker,
@@ -8,23 +11,75 @@ ExecOpkgCommand::ExecOpkgCommand(QString const &command,
                                  int start_timeout,
                                  int finish_timeout)
   : UpdateCommand(command, worker, nextCommandIndex, start_timeout, finish_timeout)
-  , m_noaction(noaction) {
+  , m_noaction(noaction)
+  , m_ok_count{0}
+  , m_fail_count{0} {
 }
 
 void ExecOpkgCommand::finished(int exitCode, QProcess::ExitStatus exitStatus) {
+    QProcess *p = (QProcess *)sender();
+    if (p) {
+        Worker *w = worker();
+        if (w) {
+            if (m_fail_count == 0 && m_ok_count > 0) {
+                emit w->showExecOpkgOverallResult(internal::EXEC_OPKG_COMMANDS_SUCCESS, m_noaction);
+            } else
+            if (m_ok_count == 0 && m_fail_count > 0) {
+                emit w->showExecOpkgOverallResult(internal::EXEC_OPKG_COMMANDS_FAIL, m_noaction);
+            } else {
+                // TODO
+                emit w->showExecOpkgOverallResult(internal::EXEC_OPKG_COMMANDS_SUCCESS, m_noaction);
+            }
+        }
+    }
     return UpdateCommand::finished(exitCode, exitStatus);
 }
 
 void ExecOpkgCommand::readyReadStandardOutput() {
     QProcess *p = (QProcess *)sender();
     if (p) {
-        QString s = p->readAllStandardOutput();
-
-        // TODO
         Worker *w = worker();
         if (w) {
-    // static constexpr const char *EXEC_OPKG_COMMANDS_SUCCESS{"success"};
-            emit w->showExecOpkgStatus(UpdateCommand::EXEC_OPKG_COMMANDS_SUCCESS);
+            QString s = p->readAllStandardOutput().trimmed();
+            if (!s.isEmpty()) {
+                m_standardOutput += s.replace(QChar('\n'), "");
+
+                // the command lines in etc/psa_update/opkg_commands are
+                // separated by "<OPKG>" markers. Note that the file opkg_commands
+                // itself is *not* changed, of course.
+
+                int startIndex, endIndex{};
+                while (((startIndex = m_standardOutput.indexOf(internal::OPKG_MARKER)) == 0) &&
+                       ((endIndex = m_standardOutput.indexOf(internal::OPKG_MARKER, 1)) != -1)) {
+
+                    QString result = m_standardOutput.mid(0, endIndex).mid(6);
+                    m_standardOutput = m_standardOutput.mid(endIndex);
+
+                    if (!s.isEmpty()) {
+                        QStringList const lst = result.split(u' ', QString::SkipEmptyParts);
+
+                        if (lst.size() >= 2) {
+                            if (lst.last() == "ok") {
+                                m_ok_count += 1;
+                                if (lst.contains("noaction")) {
+                                    emit w->showExecOpkgCommand(result);
+                                } else {
+                                    emit w->showExecOpkgCommand(result);
+                                }
+                            } else {
+                                m_fail_count += 1;
+                                if (lst.contains("noaction")) {
+                                    emit w->showExecOpkgCommand(result);
+                                } else {
+                                    emit w->showExecOpkgCommand(result);
+                                }
+                            }
+                        } else {
+                            emit w->showExecOpkgCommand(result);
+                        }
+                    }
+                }
+            }
         }
     }
 }
diff --git a/UpdatePTUDevCtrl/process/exec_opkg_command.h b/UpdatePTUDevCtrl/process/exec_opkg_command.h
index 0931d06..10e7a22 100644
--- a/UpdatePTUDevCtrl/process/exec_opkg_command.h
+++ b/UpdatePTUDevCtrl/process/exec_opkg_command.h
@@ -6,6 +6,9 @@
 
 class ExecOpkgCommand : public UpdateCommand {
     bool m_noaction{false};
+    QString m_standardOutput{};
+    int m_ok_count{};
+    int m_fail_count{};
 public:
     explicit ExecOpkgCommand(QString const &command,
                              Worker *worker,