commit 6de53fb1ed6f57643d76ab4520eb5872319e2007
author Andrew Jeffery <andrew@aj.id.au> Thu Apr 14 15:45:38 2022 +0930
committer Andrew Jeffery <andrew@aj.id.au> Tue May 10 10:12:14 2022 +0930
tree 54002f2afa6c1154b7f13b95377013212496cb7e
parent 88333fe0915ae5e7cdaf3a81bf534afecda47ff2

PerformScan: Extract findExposeActionRecord()

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: Ia4ee080ad5423a25a48987a1ccf186c54796c0de

src/PerformScan.cpp

diff --git a/src/PerformScan.cpp b/src/PerformScan.cpp
index b22ada7..cff9da0 100644
--- a/src/PerformScan.cpp
+++ b/src/PerformScan.cpp
@@ -327,6 +327,23 @@
     return false;
 }
 
+static std::optional<std::vector<std::string>::iterator>
+    findExposeActionRecord(std::vector<std::string>& matches,
+                           const nlohmann::json& exposedObject)
+{
+    auto matchIt =
+        std::find_if(matches.begin(), matches.end(),
+                     [name = (exposedObject)["Name"].get<std::string>()](
+                         const std::string& s) { return s == name; });
+
+    if (matchIt == matches.end())
+    {
+        return std::nullopt;
+    }
+
+    return matchIt;
+}
+
 void PerformScan::run()
 {
     boost::container::flat_set<std::string> dbusProbeInterfaces;
@@ -545,18 +562,14 @@
 
                                 for (auto& exposedObject : *configListFind)
                                 {
-                                    auto matchIt = std::find_if(
-                                        matches.begin(), matches.end(),
-                                        [name = (exposedObject)["Name"]
-                                                    .get<std::string>()](
-                                            const std::string& s) {
-                                            return s == name;
-                                        });
-                                    if (matchIt == matches.end())
+                                    auto match = findExposeActionRecord(
+                                        matches, exposedObject);
+                                    if (!match)
                                     {
                                         continue;
                                     }
-                                    foundMatches.insert(*matchIt);
+
+                                    foundMatches.insert(**match);
 
                                     if (isBind)
                                     {