From b7b5217b3321a865293103e4de0502ba6214bf72 Mon Sep 17 00:00:00 2001
From: John <ebusd@ebusd.eu>
Date: Sun, 24 Jan 2021 09:20:49 +0100
Subject: [PATCH] enhance decode command to allow decoding all

---
 src/ebusd/mainloop.cpp | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/ebusd/mainloop.cpp b/src/ebusd/mainloop.cpp
index c2cde05e..fa4285a3 100644
--- a/src/ebusd/mainloop.cpp
+++ b/src/ebusd/mainloop.cpp
@@ -1608,17 +1608,27 @@ result_t MainLoop::executeGrab(const vector<string>& args, ostringstream* ostrea
     return RESULT_OK;
   }
   if (args.size() >= 2 && args[1] == "result") {
-    if (args.size() == 2 || args[2] == "all") {
-      m_busHandler->formatGrabResult(args.size() == 2, false, ostream);
-      return RESULT_OK;
+    bool onlyUnknown = true;
+    bool decode = false;
+    bool invalid = false;
+    for (size_t i = args.size() - 1; i >= 2; i--) {
+      string arg = args[i];
+      if (arg == "all") {
+        onlyUnknown = false;
+      } else if (arg == "decode") {
+        decode = true;
+      } else {
+        invalid = true;
+        break;
+      }
     }
-    if (args.size() == 3 || args[2] == "decode") {
-      m_busHandler->formatGrabResult(true, true, ostream);
+    if (!invalid) {
+      m_busHandler->formatGrabResult(onlyUnknown, decode, ostream);
       return RESULT_OK;
     }
   }
   *ostream << "usage: grab [stop]\n"
-              "  or:  grab result [all|decode]\n"
+              "  or:  grab result [all|decode]*\n"
               " Start or stop grabbing, or report/decode unknown or all grabbed messages.";
   return RESULT_OK;
 }