From d9a71c135110999eaa9d83c0a7da1d3041cc85b6 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Wed, 24 Jan 2024 23:45:09 +0100
Subject: [PATCH] GenericLinuxDeviceTester: Reuse LoopRepeat element

Instead of creating quite huge recipe.

Change-Id: I8b4121d0a666f093885d1379f6f4c8093cd2619c
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/remotelinux/linuxdevicetester.cpp | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/plugins/remotelinux/linuxdevicetester.cpp b/src/plugins/remotelinux/linuxdevicetester.cpp
index 31d793990dd..e57223e9824 100644
--- a/src/plugins/remotelinux/linuxdevicetester.cpp
+++ b/src/plugins/remotelinux/linuxdevicetester.cpp
@@ -42,7 +42,6 @@ public:
     GroupItem transferTask(FileTransferMethod method,
                            const Storage<TransferStorage> &storage) const;
     GroupItem transferTasks() const;
-    GroupItem commandTask(const QString &commandName) const;
     GroupItem commandTasks() const;
 
     GenericLinuxDeviceTester *q = nullptr;
@@ -242,15 +241,20 @@ GroupItem GenericLinuxDeviceTesterPrivate::transferTasks() const
     };
 }
 
-GroupItem GenericLinuxDeviceTesterPrivate::commandTask(const QString &commandName) const
+GroupItem GenericLinuxDeviceTesterPrivate::commandTasks() const
 {
-    const auto onSetup = [this, commandName](Process &process) {
+    const QStringList commands = commandsToTest();
+    const LoopRepeat repeater(commands.size());
+
+    const auto onSetup = [this, commands, repeater](Process &process) {
+        const QString commandName = commands.at(repeater.iteration());
         emit q->progressMessage(Tr::tr("%1...").arg(commandName));
         CommandLine command{m_device->filePath("/bin/sh"), {"-c"}};
         command.addArgs(QLatin1String("\"command -v %1\"").arg(commandName), CommandLine::Raw);
         process.setCommand(command);
     };
-    const auto onDone = [this, commandName](const Process &process, DoneWith result) {
+    const auto onDone = [this, commands, repeater](const Process &process, DoneWith result) {
+        const QString commandName = commands.at(repeater.iteration());
         if (result == DoneWith::Success) {
             emit q->progressMessage(Tr::tr("%1 found.").arg(commandName));
             return;
@@ -261,18 +265,16 @@ GroupItem GenericLinuxDeviceTesterPrivate::commandTask(const QString &commandNam
                 : Tr::tr("%1 not found.").arg(commandName);
         emit q->errorMessage(message);
     };
-    return ProcessTask(onSetup, onDone);
-}
 
-GroupItem GenericLinuxDeviceTesterPrivate::commandTasks() const
-{
-    QList<GroupItem> tasks {continueOnError};
-    tasks.append(onGroupSetup([this] {
-        emit q->progressMessage(Tr::tr("Checking if required commands are available..."));
-    }));
-    for (const QString &commandName : commandsToTest())
-        tasks.append(commandTask(commandName));
-    return Group {tasks};
+    const Group root {
+        continueOnError,
+        onGroupSetup([this] {
+            emit q->progressMessage(Tr::tr("Checking if required commands are available..."));
+        }),
+        repeater,
+        ProcessTask(onSetup, onDone)
+    };
+    return root;
 }
 
 } // namespace Internal