Fix that plugin is executed several times

[platform/core/appfw/app-installers.git] / src / common / plugins / metadata_plugin.cc

diff --git a/src/common/plugins/metadata_plugin.cc b/src/common/plugins/metadata_plugin.cc
index 0cf2a53..3cd4148 100644 (file)
--- a/src/common/plugins/metadata_plugin.cc
+++ b/src/common/plugins/metadata_plugin.cc
@@ -9,7 +9,7 @@
 
 #include <algorithm>
 #include <map>
-#include <vector>
+#include <set>
 
 #include "common/utils/glist_range.h"
 
@@ -94,22 +94,21 @@ bool MetadataPlugin::Run(xmlDocPtr /*doc_ptr*/, manifest_x* manifest,
   if (tag.empty())
     return false;
 
+  std::set<std::string> appid_list;
   if (action_type == ActionType::Upgrade) {
     if (pkgmgrinfo_plugininfo_foreach_plugininfo(manifest->package,
         MetadataPlugin::kType,
         plugin_info_.name().c_str(),
         [](const char*, const char* appid, const char*,
             const char*, void* user_data) -> int {
-          auto* appid_list =
-              static_cast<std::vector<std::string>*>(user_data);
-          appid_list->emplace_back(std::string(appid));
+          auto* list = static_cast<std::set<std::string>*>(user_data);
+          list->emplace(std::string(appid));
           return PMINFO_R_OK;
         },
-        &appid_list_) != PMINFO_R_OK) {
+        &appid_list) != PMINFO_R_OK) {
       LOG(ERROR) << "Failed to get previous execution info";
       return false;
     }
-    std::sort(appid_list_.begin(), appid_list_.end());
   }
 
   for (application_x* app : GListRange<application_x*>(manifest->application)) {
@@ -156,10 +155,7 @@ bool MetadataPlugin::Run(xmlDocPtr /*doc_ptr*/, manifest_x* manifest,
         g_list_free_full(md_list, &ClearMetadataDetail);
         return false;
       }
-      auto iter = std::lower_bound(appid_list_.begin(), appid_list_.end(),
-                                     app->appid);
-      if (iter != appid_list_.end() && *iter == app->appid)
-        appid_list_.erase(iter);
+      appid_list.erase(app->appid);
     }
     int result = 0;
     Exec(name, &result, manifest->package, app->appid, md_list);
@@ -177,7 +173,7 @@ bool MetadataPlugin::Run(xmlDocPtr /*doc_ptr*/, manifest_x* manifest,
     name = GetFunctionName(action_type);
   else
     name = GetFunctionName(ActionType::Removed);
-  for (const auto& appid : appid_list_) {
+  for (const auto& appid : appid_list) {
     int result = 0;
     Exec(name, &result, manifest->package, appid.c_str(), nullptr);
     if (result) {