Add package paremeter to application filter

Package information of the application may be required
in the application filter

Change-Id: I1386eb75cd30f939eef253621b13300904398b1a
Signed-off-by: ilho kim <ilho159.kim@samsung.com>

diff --git a/src/server/database/db_handle_provider.cc b/src/server/database/db_handle_provider.cc
index 78bc332fc156e2dee8c90930f4578eca63ce3854..258862e049ba8b8b6441ade2a5e8e5bdf6b9b339 100644 (file)
--- a/src/server/database/db_handle_provider.cc
+++ b/src/server/database/db_handle_provider.cc
@@ -483,22 +483,32 @@ void DBHandleProvider::AddPackage(std::string package,
 }
 
 inline bool CheckAppFilters(pkgmgrinfo_filter_x* filter,
-  const std::shared_ptr<application_x>& info,
+  const std::shared_ptr<application_x>& app_info,
+  const std::shared_ptr<package_x>& pkg_info,
   const std::unordered_map<std::string, std::string>& metadata_map) {
   for (auto* it = filter->list; it != nullptr; it = g_slist_next(it)) {
     auto node = reinterpret_cast<pkgmgrinfo_node_x*>(it->data);
     auto* checker = FilterCheckerProvider::GetInst().
         GetAppFilterChecker(node->prop);
-    if (!checker->CheckFilter(node, info.get()))
+    if (!checker->CheckFilter(node, app_info.get(), pkg_info.get()))
       return false;
   }
 
   bool pass = true;
   if (!metadata_map.empty())
-    pass = CheckMetadataFilter(info->metadata, metadata_map);
+    pass = CheckMetadataFilter(app_info->metadata, metadata_map);
   return pass;
 }
 
+std::shared_ptr<package_x> DBHandleProvider::GetPackageByApp(
+    const char* appid) {
+  auto it = pkg_map_.find(appid);
+  if (it == pkg_map_.end())
+    return nullptr;
+
+  return it->second;
+}
+
 std::vector<std::shared_ptr<application_x>> DBHandleProvider::GetApplications(
     pid_t pid, pkgmgrinfo_filter_x* filter,
     const std::string& app) {
@@ -523,13 +533,15 @@ std::vector<std::shared_ptr<application_x>> DBHandleProvider::GetApplications(
 
   if (app.empty()) {
     for (auto& info : app_map_) {
-      if (CheckAppFilters(filter, info.second, metadata_map))
+      if (CheckAppFilters(filter, info.second,
+          GetPackageByApp(info.second->package), metadata_map))
         ret.push_back(info.second);
     }
   } else {
     auto map_it = app_map_.find(app);
     if (map_it != app_map_.end() &&
-        CheckAppFilters(filter, map_it->second, metadata_map))
+        CheckAppFilters(filter, map_it->second,
+            GetPackageByApp(map_it->second->package), metadata_map))
       ret.push_back(map_it->second);
   }
 

diff --git a/src/server/database/db_handle_provider.hh b/src/server/database/db_handle_provider.hh
index 324f23cd91bfe1e0d41ef9ddf25161aa2551f911..e8ec9eeb6d98aea431120b6202f412d99e5fe4aa 100644 (file)
--- a/src/server/database/db_handle_provider.hh
+++ b/src/server/database/db_handle_provider.hh
@@ -81,6 +81,7 @@ class EXPORT_API DBHandleProvider {
   void AddApplication(std::string app, std::shared_ptr<application_x> info);
   void InsertPID(pid_t pid);
   bool ErasePID(pid_t pid);
+  std::shared_ptr<package_x> GetPackageByApp(const char* appid);
 
  private:
   static std::unordered_map<uid_t,

diff --git a/src/server/filter_checker/app_filter_checker/app_disable_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/app_disable_app_filter_checker.cc
index bf7619fe8a1d0ec8af69bbfaa5e32ab32c0a13b8..c01f04c5c12b22439451ea7efc734dfcbb89237f 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/app_disable_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/app_disable_app_filter_checker.cc
@@ -25,9 +25,9 @@ namespace pkgmgr_server {
 namespace database {
 
 bool AppDisableAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                             application_x* info) {
-  return (node->value != nullptr && info->is_disabled != nullptr &&
-          strcasecmp(node->value, info->is_disabled) == 0);
+    application_x* app_info, package_x* pkg_info) {
+  return (node->value != nullptr && app_info->is_disabled != nullptr &&
+          strcasecmp(node->value, app_info->is_disabled) == 0);
 }
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/app_disable_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/app_disable_app_filter_checker.hh
index dae22bf35509ac958822cf3ee60ed2fc07344420..0a932d1208d494db132e2e04b3015ebcde4f7515 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/app_disable_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/app_disable_app_filter_checker.hh
@@ -29,7 +29,8 @@ class AppDisableAppFilterChecker: public IAppFilterChecker {
  public:
   AppDisableAppFilterChecker() = default;
   ~AppDisableAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/appid_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/appid_app_filter_checker.cc
index 98b7b89816eea0451d2b5256d6f4857fcd5f5590..d3440f3532c27c72e91f2223bf5156cc14338754 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/appid_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/appid_app_filter_checker.cc
@@ -23,9 +23,9 @@ namespace pkgmgr_server {
 namespace database {
 
 bool AppIdAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                        application_x* info) {
-  return (node->value != nullptr && info->appid != nullptr &&
-          strcmp(node->value, info->appid) == 0);
+    application_x* app_info, package_x* pkg_info) {
+  return (node->value != nullptr && app_info->appid != nullptr &&
+          strcmp(node->value, app_info->appid) == 0);
 }
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/appid_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/appid_app_filter_checker.hh
index 83d0ada14ea77bfc9d265e1f118c6d52f57e5711..374d20bb664f75b0256cdd9e66cf5d3ad22c4752 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/appid_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/appid_app_filter_checker.hh
@@ -29,7 +29,8 @@ class AppIdAppFilterChecker: public IAppFilterChecker {
  public:
   AppIdAppFilterChecker() = default;
   ~AppIdAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/auto_restart_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/auto_restart_app_filter_checker.cc
index 2f456902b5d0f43660cdb03a55230d88f78f771a..558e24372aced304dff1b6c0fd5a7893e5dd3706 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/auto_restart_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/auto_restart_app_filter_checker.cc
@@ -20,9 +20,9 @@ namespace pkgmgr_server {
 namespace database {
 
 bool AutoRestartAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                             application_x* info) {
-  return (node->value != nullptr && info->autorestart != nullptr &&
-          strcasecmp(node->value, info->autorestart) == 0);
+    application_x* app_info, package_x* pkg_info) {
+  return (node->value != nullptr && app_info->autorestart != nullptr &&
+          strcasecmp(node->value, app_info->autorestart) == 0);
 }
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/auto_restart_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/auto_restart_app_filter_checker.hh
index 9f58114118b067d97453c766accc68819a56473b..55d8120151c5ff4bae1a6a5bb2c7a3bb4d44d825 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/auto_restart_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/auto_restart_app_filter_checker.hh
@@ -29,7 +29,8 @@ class AutoRestartAppFilterChecker: public IAppFilterChecker {
  public:
   AutoRestartAppFilterChecker() = default;
   ~AutoRestartAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/category_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/category_app_filter_checker.cc
index c84737a254d57cc8da7bf1ee208cb094a3bf2ffe..55d5e534d9f92d49a1afff557bf16d8fbfb05d5c 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/category_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/category_app_filter_checker.cc
@@ -25,8 +25,8 @@ namespace pkgmgr_server {
 namespace database {
 
 bool CategoryAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                           application_x* info) {
-  for (auto* it = info->category; it != nullptr; it = g_list_next(it)) {
+    application_x* app_info, package_x* pkg_info) {
+  for (auto* it = app_info->category; it != nullptr; it = g_list_next(it)) {
     char* value = reinterpret_cast<char*>(it->data);
     if (value != nullptr && strcmp(value, node->value) == 0) return true;
   }

diff --git a/src/server/filter_checker/app_filter_checker/category_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/category_app_filter_checker.hh
index 155b5a304a73067714b52019b9b2baed7a557d0a..326e0b1d0b2dc0df4c2721904cde4d251f8009bb 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/category_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/category_app_filter_checker.hh
@@ -29,7 +29,8 @@ class CategoryAppFilterChecker: public IAppFilterChecker {
  public:
   CategoryAppFilterChecker() = default;
   ~CategoryAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/check_storage_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/check_storage_app_filter_checker.cc
index 8878aab92852518333b20b39b26d4abd0296b3ab..4101bf8b110cc084c08a8e01e6e127c80cae2703 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/check_storage_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/check_storage_app_filter_checker.cc
@@ -20,9 +20,9 @@ namespace pkgmgr_server {
 namespace database {
 
 bool CheckStorageAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-    application_x* info) {
+    application_x* app_info, package_x* pkg_info) {
   return (node->value == nullptr || strcasecmp(node->value, "true") != 0 ||
-      __appinfo_check_installed_storage(info) == PMINFO_R_OK);
+      __appinfo_check_installed_storage(app_info) == PMINFO_R_OK);
 }
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/check_storage_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/check_storage_app_filter_checker.hh
index b075c810e729e7e8e3b509383d9969a8cd64dec4..f21a13173cbd61c1c1b83c5e54ded650ce61798e 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/check_storage_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/check_storage_app_filter_checker.hh
@@ -29,7 +29,8 @@ class CheckStorageAppFilterChecker: public IAppFilterChecker {
  public:
   CheckStorageAppFilterChecker() = default;
   ~CheckStorageAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/component_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/component_app_filter_checker.cc
index 9352fbd0d5eb4cf4f312e7984dee95ff335f813f..7de9fecca1fd59a107b35ccc3b261e40592da8d7 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/component_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/component_app_filter_checker.cc
@@ -23,9 +23,9 @@ namespace pkgmgr_server {
 namespace database {
 
 bool ComponentAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                           application_x* info) {
-  return (node->value != nullptr && info->component != nullptr &&
-          strcmp(node->value, info->component) == 0);
+    application_x* app_info, package_x* pkg_info) {
+  return (node->value != nullptr && app_info->component != nullptr &&
+          strcmp(node->value, app_info->component) == 0);
 }
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/component_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/component_app_filter_checker.hh
index 80ac0c702ca0b19c7e98f10bfb2c27c23cf89da0..68ac2b9883c51a7722196357f266384462e57411 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/component_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/component_app_filter_checker.hh
@@ -29,7 +29,8 @@ class ComponentAppFilterChecker: public IAppFilterChecker {
  public:
   ComponentAppFilterChecker() = default;
   ~ComponentAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/default_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/default_app_filter_checker.cc
index 16b74ed53e3e872a9d7fe5f2224f98b46acda426..04c3b70e3f9742817550707da6083afc38092c83 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/default_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/default_app_filter_checker.cc
@@ -23,7 +23,7 @@ namespace pkgmgr_server {
 namespace database {
 
 bool DefaultAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                          application_x* info) {
+    application_x* app_info, package_x* pkg_info) {
   return true;
 }
 

diff --git a/src/server/filter_checker/app_filter_checker/default_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/default_app_filter_checker.hh
index 490273a76227b96a33f1bde7eb93c0839e491df9..7d3f3773fbff58ada5ec1303105dd45466e74b50 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/default_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/default_app_filter_checker.hh
@@ -29,7 +29,8 @@ class DefaultAppFilterChecker: public IAppFilterChecker {
  public:
   DefaultAppFilterChecker() = default;
   ~DefaultAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/exec_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/exec_app_filter_checker.cc
index 184d9601af9a8404a070e781d7e59adb185f308a..541bfe7ae4d992e5bd14749509998e66e5e310ed 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/exec_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/exec_app_filter_checker.cc
@@ -23,9 +23,9 @@ namespace pkgmgr_server {
 namespace database {
 
 bool ExecAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                       application_x* info) {
-  return (node->value != nullptr && info->exec != nullptr &&
-          strcmp(node->value, info->exec) == 0);
+    application_x* app_info, package_x* pkg_info) {
+  return (node->value != nullptr && app_info->exec != nullptr &&
+          strcmp(node->value, app_info->exec) == 0);
 }
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/exec_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/exec_app_filter_checker.hh
index ae4593d32fe9fc1563dd6ee751b7f7fa4a1397ba..17b394c984b217c9b2c3d590d883396f1f411b6a 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/exec_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/exec_app_filter_checker.hh
@@ -29,7 +29,8 @@ class ExecAppFilterChecker: public IAppFilterChecker {
  public:
   ExecAppFilterChecker() = default;
   ~ExecAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/hw_acceleration_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/hw_acceleration_app_filter_checker.cc
index f6756fbfbca88a7fb66b4001545038c7e349b660..256d5e99ea41c33edb1b4797c1a4668747390601 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/hw_acceleration_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/hw_acceleration_app_filter_checker.cc
@@ -20,9 +20,9 @@ namespace pkgmgr_server {
 namespace database {
 
 bool HWAccelerationAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                             application_x* info) {
-  return (node->value != nullptr && info->hwacceleration != nullptr &&
-          strcmp(node->value, info->hwacceleration) == 0);
+    application_x* app_info, package_x* pkg_info) {
+  return (node->value != nullptr && app_info->hwacceleration != nullptr &&
+          strcmp(node->value, app_info->hwacceleration) == 0);
 }
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/hw_acceleration_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/hw_acceleration_app_filter_checker.hh
index 931ce00dd6792230e5342622e9bfe9ca5a70d143..34b1159e7db5dc548f01995ef54b63338b151c50 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/hw_acceleration_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/hw_acceleration_app_filter_checker.hh
@@ -29,7 +29,8 @@ class HWAccelerationAppFilterChecker: public IAppFilterChecker {
  public:
   HWAccelerationAppFilterChecker() = default;
   ~HWAccelerationAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/icon_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/icon_app_filter_checker.cc
index f04fc293b620989601082c58c5876cdc92d7c139..362a63e2017e11519d793db5a382410e38a8bf24 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/icon_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/icon_app_filter_checker.cc
@@ -23,11 +23,11 @@ namespace pkgmgr_server {
 namespace database {
 
 bool IconAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                             application_x* info) {
+    application_x* app_info, package_x* pkg_info) {
   if (node->value == nullptr)
     return false;
 
-  for (auto* it = info->icon; it; it = g_list_next(it)) {
+  for (auto* it = app_info->icon; it; it = g_list_next(it)) {
     auto path = reinterpret_cast<icon_x*>(it->data)->text;
     if (path != nullptr && strcmp(path, node->value) == 0)
       return true;

diff --git a/src/server/filter_checker/app_filter_checker/icon_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/icon_app_filter_checker.hh
index 9f8361741918e84ee7040c3ab2184c805a2466fa..c001f8d7dd700a26f744bd0ee8f2ab390323c40d 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/icon_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/icon_app_filter_checker.hh
@@ -29,7 +29,8 @@ class IconAppFilterChecker: public IAppFilterChecker {
  public:
   IconAppFilterChecker() = default;
   ~IconAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/launch_condition_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/launch_condition_app_filter_checker.cc
index 17981ba0906713d94c1d37350cd59ecd4e8d686f..5bb37af6a070b0d2c954d4b5a07c23d17f610a02 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/launch_condition_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/launch_condition_app_filter_checker.cc
@@ -20,9 +20,9 @@ namespace pkgmgr_server {
 namespace database {
 
 bool LaunchConditionAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                             application_x* info) {
-  return (node->value != nullptr && info->launchcondition != nullptr &&
-          strcmp(node->value, info->launchcondition) == 0);
+    application_x* app_info, package_x* pkg_info) {
+  return (node->value != nullptr && app_info->launchcondition != nullptr &&
+          strcmp(node->value, app_info->launchcondition) == 0);
 }
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/launch_condition_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/launch_condition_app_filter_checker.hh
index 57c97461be235376bfcecd7c780bc0704a449266..d21e790d11e63d48c571f9bf7329992219df435b 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/launch_condition_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/launch_condition_app_filter_checker.hh
@@ -29,7 +29,8 @@ class LaunchConditionAppFilterChecker: public IAppFilterChecker {
  public:
   LaunchConditionAppFilterChecker() = default;
   ~LaunchConditionAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/mime_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/mime_app_filter_checker.cc
index d296ab0ddc525021d2260d5df8c6ac285abeebbf..2dd8237082a1540dcbbcea64e78fa83909fbb4d1 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/mime_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/mime_app_filter_checker.cc
@@ -22,10 +22,10 @@ namespace pkgmgr_server {
 namespace database {
 
 bool MimeAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                            application_x* info) {
+    application_x* app_info, package_x* pkg_info) {
   if (node->value == nullptr)
     return false;
-  for (auto* it = info->appcontrol; it != nullptr; it = g_list_next(it)) {
+  for (auto* it = app_info->appcontrol; it != nullptr; it = g_list_next(it)) {
     char* value = reinterpret_cast<appcontrol_x*>(it->data)->mime;
     if (value != nullptr && strcmp(value, node->value) == 0)
       return true;

diff --git a/src/server/filter_checker/app_filter_checker/mime_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/mime_app_filter_checker.hh
index adfef2f488c4c3efaf0d24684d26bbfcadb7ee3c..8fef5edf0b49b8b7049a10d86ea6f0139cec0ff6 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/mime_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/mime_app_filter_checker.hh
@@ -29,7 +29,8 @@ class MimeAppFilterChecker: public IAppFilterChecker {
  public:
   MimeAppFilterChecker() = default;
   ~MimeAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/multiple_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/multiple_app_filter_checker.cc
index a54da8640b95adb494232403b98135e0e39a3c24..ee77f1670a7cf0ff9e6bac4dae94ad9b6f6d3751 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/multiple_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/multiple_app_filter_checker.cc
@@ -20,9 +20,9 @@ namespace pkgmgr_server {
 namespace database {
 
 bool MultipleAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                            application_x* info) {
-  return (node->value != nullptr && info->multiple != nullptr &&
-          strcasecmp(node->value, info->multiple) == 0);
+    application_x* app_info, package_x* pkg_info) {
+  return (node->value != nullptr && app_info->multiple != nullptr &&
+          strcasecmp(node->value, app_info->multiple) == 0);
 }
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/multiple_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/multiple_app_filter_checker.hh
index 5462e872459987a2a070b0b889d8c582514151f9..4542014ff5d7ebdcf3c0f65a0fbee10f876d2792 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/multiple_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/multiple_app_filter_checker.hh
@@ -29,7 +29,8 @@ class MultipleAppFilterChecker: public IAppFilterChecker {
  public:
   MultipleAppFilterChecker() = default;
   ~MultipleAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/nodisplay_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/nodisplay_app_filter_checker.cc
index dfdcdbfa283b5fbca5bd03826ae327ef2179128f..9f888754b36f36cbde7b1e2bacec29f5fa831824 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/nodisplay_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/nodisplay_app_filter_checker.cc
@@ -23,9 +23,9 @@ namespace pkgmgr_server {
 namespace database {
 
 bool NoDisplayAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                            application_x* info) {
-  return (node->value != nullptr && info->nodisplay != nullptr &&
-          strcasecmp(node->value, info->nodisplay) == 0);
+    application_x* app_info, package_x* pkg_info) {
+  return (node->value != nullptr && app_info->nodisplay != nullptr &&
+          strcasecmp(node->value, app_info->nodisplay) == 0);
 }
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/nodisplay_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/nodisplay_app_filter_checker.hh
index ee17527cf25a7948f452a610954882facf85b130..5e0ef1557f7c1403710901c63404be34b9496b0c 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/nodisplay_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/nodisplay_app_filter_checker.hh
@@ -29,7 +29,8 @@ class NoDisplayAppFilterChecker: public IAppFilterChecker {
  public:
   NoDisplayAppFilterChecker() = default;
   ~NoDisplayAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/onboot_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/onboot_app_filter_checker.cc
index 0ad6559872c85a808b3f0c8d16870b59a5e80ad1..baa916d5baf609c99ca5506b8330a9a26ff2d445 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/onboot_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/onboot_app_filter_checker.cc
@@ -23,9 +23,9 @@ namespace pkgmgr_server {
 namespace database {
 
 bool OnBootAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                            application_x* info) {
-  return (node->value != nullptr && info->onboot != nullptr &&
-          strcasecmp(node->value, info->onboot) == 0);
+    application_x* app_info, package_x* pkg_info) {
+  return (node->value != nullptr && app_info->onboot != nullptr &&
+          strcasecmp(node->value, app_info->onboot) == 0);
 }
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/onboot_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/onboot_app_filter_checker.hh
index 83a49659d033c8640227d68f36d414256bfc9bf0..f4988f1177b0650299feeadf72f2953fdc29c613 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/onboot_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/onboot_app_filter_checker.hh
@@ -29,7 +29,8 @@ class OnBootAppFilterChecker: public IAppFilterChecker {
  public:
   OnBootAppFilterChecker() = default;
   ~OnBootAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/operation_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/operation_app_filter_checker.cc
index 289188a3f9077bd571150f1fa71633f996fc5712..8ccdaf5229ba5ff751c71d3c4652ab6794473c4b 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/operation_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/operation_app_filter_checker.cc
@@ -22,8 +22,8 @@ namespace pkgmgr_server {
 namespace database {
 
 bool OperationAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                            application_x* info) {
-  for (auto* it = info->appcontrol; it != nullptr; it = g_list_next(it)) {
+    application_x* app_info, package_x* pkg_info) {
+  for (auto* it = app_info->appcontrol; it != nullptr; it = g_list_next(it)) {
     char* value = reinterpret_cast<appcontrol_x*>(it->data)->operation;
     if (value != nullptr && strcmp(value, node->value) == 0)
       return true;

diff --git a/src/server/filter_checker/app_filter_checker/operation_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/operation_app_filter_checker.hh
index 0c8f9f1f7f7eeab32880c0b6df5f24de34e7383b..56602cc0c290a7d84d1a0041e670f833b8e54f79 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/operation_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/operation_app_filter_checker.hh
@@ -29,7 +29,8 @@ class OperationAppFilterChecker: public IAppFilterChecker {
  public:
   OperationAppFilterChecker() = default;
   ~OperationAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/pkg_disable_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/pkg_disable_app_filter_checker.cc
index bd9d1169a26c7f6c15a75da824accf0bbae0806a..96a042bc9f2762cd9ecc0f1950ac65f5a591cbe2 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/pkg_disable_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/pkg_disable_app_filter_checker.cc
@@ -23,7 +23,7 @@ namespace pkgmgr_server {
 namespace database {
 
 bool PkgDisableAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                             application_x* info) {
+    application_x* app_info, package_x* pkg_info) {
   return (node->value != nullptr && strcasecmp(node->value, "false") == 0);
 }
 

diff --git a/src/server/filter_checker/app_filter_checker/pkg_disable_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/pkg_disable_app_filter_checker.hh
index 7fd69026d76ee5ec31a65256efe2a33ed2bb6ea4..d081ead9b52f23463ef39612197e57194c95ca7c 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/pkg_disable_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/pkg_disable_app_filter_checker.hh
@@ -29,7 +29,8 @@ class PkgDisableAppFilterChecker: public IAppFilterChecker {
  public:
   PkgDisableAppFilterChecker() = default;
   ~PkgDisableAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/pkgid_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/pkgid_app_filter_checker.cc
index 08d209375990f3d3922e2288823463085691fbda..0d5bd96e4d4243f9ab8afc303903b257ed0a0db4 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/pkgid_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/pkgid_app_filter_checker.cc
@@ -23,9 +23,9 @@ namespace pkgmgr_server {
 namespace database {
 
 bool PkgIdAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                            application_x* info) {
-  return (node->value != nullptr && info->package != nullptr &&
-          strcmp(node->value, info->package) == 0);
+    application_x* app_info, package_x* pkg_info) {
+  return (node->value != nullptr && app_info->package != nullptr &&
+          strcmp(node->value, app_info->package) == 0);
 }
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/pkgid_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/pkgid_app_filter_checker.hh
index 1f35348eebe81c28c90a5484e3d43cfb82c43e82..f49116de5296da12eda98cc4225dd4d419311d17 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/pkgid_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/pkgid_app_filter_checker.hh
@@ -29,7 +29,8 @@ class PkgIdAppFilterChecker: public IAppFilterChecker {
  public:
   PkgIdAppFilterChecker() = default;
   ~PkgIdAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/privilege_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/privilege_app_filter_checker.cc
index 916c8d6b0023644b9fdf7e3da8fea2e199644c52..2db2a87200b3f0ed74e3f00148e017b194533a5c 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/privilege_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/privilege_app_filter_checker.cc
@@ -22,8 +22,8 @@ namespace pkgmgr_server {
 namespace database {
 
 bool PrivilegeAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                            application_x* info) {
-  for (auto* it = info->privileges; it != nullptr; it = g_list_next(it)) {
+    application_x* app_info, package_x* pkg_info) {
+  for (auto* it = app_info->privileges; it != nullptr; it = g_list_next(it)) {
     char* value = reinterpret_cast<privilege_x*>(it->data)->value;
     if (value != nullptr && strcmp(value, node->value) == 0) return true;
   }

diff --git a/src/server/filter_checker/app_filter_checker/privilege_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/privilege_app_filter_checker.hh
index f94679876796a503af66aac00b41633f4569ecc7..10d5ce4fe337d420c1a8d78e2feb4ed92a06b8e2 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/privilege_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/privilege_app_filter_checker.hh
@@ -29,7 +29,8 @@ class PrivilegeAppFilterChecker: public IAppFilterChecker {
  public:
   PrivilegeAppFilterChecker() = default;
   ~PrivilegeAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/screen_reader_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/screen_reader_app_filter_checker.cc
index 6536c02b7afadaed760cc293b117a8b73306f4fd..2ce7ed6555751b90772258857c52baeaff843ccb 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/screen_reader_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/screen_reader_app_filter_checker.cc
@@ -20,9 +20,9 @@ namespace pkgmgr_server {
 namespace database {
 
 bool ScreenReaderAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                             application_x* info) {
-  return (node->value != nullptr && info->screenreader != nullptr &&
-          strcmp(node->value, info->screenreader) == 0);
+    application_x* app_info, package_x* pkg_info) {
+  return (node->value != nullptr && app_info->screenreader != nullptr &&
+          strcmp(node->value, app_info->screenreader) == 0);
 }
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/screen_reader_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/screen_reader_app_filter_checker.hh
index 2ddf2f3e250edc11eacce7d440b50394fdd1e892..f0056684055c4bf3243e5d822425419a139e06f4 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/screen_reader_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/screen_reader_app_filter_checker.hh
@@ -29,7 +29,8 @@ class ScreenReaderAppFilterChecker: public IAppFilterChecker {
  public:
   ScreenReaderAppFilterChecker() = default;
   ~ScreenReaderAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/storage_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/storage_app_filter_checker.cc
index e968bfbc2040e7525c73e2f8ce22f219d8f4abbd..9f9c39f40d3a6b1b792a7a2d06c0c25d053476db 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/storage_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/storage_app_filter_checker.cc
@@ -23,9 +23,9 @@ namespace pkgmgr_server {
 namespace database {
 
 bool StorageAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                             application_x* info) {
-  return (node->value != nullptr && info->installed_storage != nullptr &&
-          strcasecmp(node->value, info->installed_storage) == 0);
+    application_x* app_info, package_x* pkg_info) {
+  return (node->value != nullptr && app_info->installed_storage != nullptr &&
+          strcasecmp(node->value, app_info->installed_storage) == 0);
 }
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/storage_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/storage_app_filter_checker.hh
index cd56240228a34e50384325c9b8fa75ed069a953b..002c15677a12448aac635be52abc344918d48711 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/storage_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/storage_app_filter_checker.hh
@@ -29,7 +29,8 @@ class StorageAppFilterChecker: public IAppFilterChecker {
  public:
   StorageAppFilterChecker() = default;
   ~StorageAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/support_disable_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/support_disable_app_filter_checker.cc
index 5f90402e467de7c73fb800a2677ca4acc0d1b47b..4ee36ad5ff4871c7025a5ed8ae7e9880e6cc06fe 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/support_disable_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/support_disable_app_filter_checker.cc
@@ -20,9 +20,9 @@ namespace pkgmgr_server {
 namespace database {
 
 bool SupportDisableAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                             application_x* info) {
-  return (node->value != nullptr && info->support_disable != nullptr &&
-          strcasecmp(node->value, info->ui_gadget) == 0);
+    application_x* app_info, package_x* pkg_info) {
+  return (node->value != nullptr && app_info->support_disable != nullptr &&
+          strcasecmp(node->value, app_info->ui_gadget) == 0);
 }
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/support_disable_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/support_disable_app_filter_checker.hh
index 6481e1c8bdd085b7252941dbe4253ff1c044a7ad..d699eae55b7b891fcba1cb4c9ecd64c7aeee919d 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/support_disable_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/support_disable_app_filter_checker.hh
@@ -29,7 +29,8 @@ class SupportDisableAppFilterChecker: public IAppFilterChecker {
  public:
   SupportDisableAppFilterChecker() = default;
   ~SupportDisableAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/support_mode_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/support_mode_app_filter_checker.cc
index a303d113211f32e12a43583d5c1e80e69775b99f..85b9dd567be41dbdb0a2dd4dcd571ba95c6f3590 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/support_mode_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/support_mode_app_filter_checker.cc
@@ -20,9 +20,9 @@ namespace pkgmgr_server {
 namespace database {
 
 bool SupportModeAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                             application_x* info) {
-  return (node->value != nullptr && info->support_mode != nullptr &&
-          strcmp(node->value, info->support_mode) == 0);
+    application_x* app_info, package_x* pkg_info) {
+  return (node->value != nullptr && app_info->support_mode != nullptr &&
+          strcmp(node->value, app_info->support_mode) == 0);
 }
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/support_mode_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/support_mode_app_filter_checker.hh
index 380b89adf0abcdc7730890b1e3d3ea3bf1dd4dd1..b8cb47e5d26acf4d1e0d8a2c931af40e12b14138 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/support_mode_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/support_mode_app_filter_checker.hh
@@ -29,7 +29,8 @@ class SupportModeAppFilterChecker: public IAppFilterChecker {
  public:
   SupportModeAppFilterChecker() = default;
   ~SupportModeAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/task_manage_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/task_manage_app_filter_checker.cc
index 501db60b55c0d770c7589eb3f5c00c259a676492..2f096b6cb53a0d67ef3b932fe6a1aa09361b83d6 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/task_manage_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/task_manage_app_filter_checker.cc
@@ -20,9 +20,9 @@ namespace pkgmgr_server {
 namespace database {
 
 bool TaskManageAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                             application_x* info) {
-  return (node->value != nullptr && info->taskmanage != nullptr &&
-          strcasecmp(node->value, info->taskmanage) == 0);
+    application_x* app_info, package_x* pkg_info) {
+  return (node->value != nullptr && app_info->taskmanage != nullptr &&
+          strcasecmp(node->value, app_info->taskmanage) == 0);
 }
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/task_manage_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/task_manage_app_filter_checker.hh
index 469936a54a390dcc4d853aec3590c1d07a362ca0..381fb927e51e10ca452809bdbe78c86ac921a864 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/task_manage_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/task_manage_app_filter_checker.hh
@@ -29,7 +29,8 @@ class TaskManageAppFilterChecker: public IAppFilterChecker {
  public:
   TaskManageAppFilterChecker() = default;
   ~TaskManageAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/type_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/type_app_filter_checker.cc
index 76e5e2f6f2573ff6e25a88e68185d2a80038c24d..ec8018520fc6d056bdef27034ca541528ca1ccae 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/type_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/type_app_filter_checker.cc
@@ -23,9 +23,9 @@ namespace pkgmgr_server {
 namespace database {
 
 bool TypeAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                            application_x* info) {
-  return (node->value != nullptr && info->type != nullptr &&
-          strcmp(node->value, info->type) == 0);
+    application_x* app_info, package_x* pkg_info) {
+  return (node->value != nullptr && app_info->type != nullptr &&
+          strcmp(node->value, app_info->type) == 0);
 }
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/type_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/type_app_filter_checker.hh
index 951d7dd62238d37a5b32b2f769f508ae2cc20420..db0649e7905c6dff91652c5f839957fc0f39227a 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/type_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/type_app_filter_checker.hh
@@ -29,7 +29,8 @@ class TypeAppFilterChecker: public IAppFilterChecker {
  public:
   TypeAppFilterChecker() = default;
   ~TypeAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/ui_gadget_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/ui_gadget_app_filter_checker.cc
index bf6ece0be12b16bda6ccdcd2fce4205bd8270bc4..dbbc134b335ae12b4eff5be4d2097f1f7ff8e906 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/ui_gadget_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/ui_gadget_app_filter_checker.cc
@@ -20,9 +20,9 @@ namespace pkgmgr_server {
 namespace database {
 
 bool UIGadgetAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                             application_x* info) {
-  return (node->value != nullptr && info->ui_gadget != nullptr &&
-          strcmp(node->value, info->ui_gadget) == 0);
+    application_x* app_info, package_x* pkg_info) {
+  return (node->value != nullptr && app_info->ui_gadget != nullptr &&
+          strcmp(node->value, app_info->ui_gadget) == 0);
 }
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/ui_gadget_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/ui_gadget_app_filter_checker.hh
index 4fb25002e789508596a437f275a244394c843ecc..868d422f6739cb6f4409248e4342814a9f38d504 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/ui_gadget_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/ui_gadget_app_filter_checker.hh
@@ -29,7 +29,8 @@ class UIGadgetAppFilterChecker: public IAppFilterChecker {
  public:
   UIGadgetAppFilterChecker() = default;
   ~UIGadgetAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker/uri_app_filter_checker.cc b/src/server/filter_checker/app_filter_checker/uri_app_filter_checker.cc
index 6d23091e74e974b3f3c1c16e8aeaba7f011e297b..de913e3667845a7731eb17a8a282b4aa880fc666 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/uri_app_filter_checker.cc
+++ b/src/server/filter_checker/app_filter_checker/uri_app_filter_checker.cc
@@ -22,10 +22,10 @@ namespace pkgmgr_server {
 namespace database {
 
 bool URIAppFilterChecker::CheckFilter(pkgmgrinfo_node_x* node,
-                                            application_x* info) {
+    application_x* app_info, package_x* pkg_info) {
   if (node->value == nullptr)
     return false;
-  for (auto* it = info->appcontrol; it != nullptr; it = g_list_next(it)) {
+  for (auto* it = app_info->appcontrol; it != nullptr; it = g_list_next(it)) {
     char* value = reinterpret_cast<appcontrol_x*>(it->data)->uri;
     if (value != nullptr && strcmp(value, node->value) == 0)
       return true;

diff --git a/src/server/filter_checker/app_filter_checker/uri_app_filter_checker.hh b/src/server/filter_checker/app_filter_checker/uri_app_filter_checker.hh
index 44783b5cf4b2dfe4467d2ff037496c59ffddb99f..b6fd70bb6fb903dc66a26d377bd8bb79339a9fee 100644 (file)
--- a/src/server/filter_checker/app_filter_checker/uri_app_filter_checker.hh
+++ b/src/server/filter_checker/app_filter_checker/uri_app_filter_checker.hh
@@ -29,7 +29,8 @@ class URIAppFilterChecker: public IAppFilterChecker {
  public:
   URIAppFilterChecker() = default;
   ~URIAppFilterChecker() = default;
-  bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) override;
+  bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) override;
 };
 
 }  // namespace database

diff --git a/src/server/filter_checker/app_filter_checker_base.hh b/src/server/filter_checker/app_filter_checker_base.hh
index ae00f9db75836b88ca14aa7936e577f87d13f70e..f5752723b50a7a626567c7b771afb14bc3543514 100644 (file)
--- a/src/server/filter_checker/app_filter_checker_base.hh
+++ b/src/server/filter_checker/app_filter_checker_base.hh
@@ -27,7 +27,8 @@ class IAppFilterChecker {
  public:
   IAppFilterChecker() = default;
   virtual ~IAppFilterChecker() = default;
-  virtual bool CheckFilter(pkgmgrinfo_node_x* node, application_x* info) = 0;
+  virtual bool CheckFilter(pkgmgrinfo_node_x* node,
+      application_x* app_info, package_x* pkg_info) = 0;
 };
 
 }  // namespace database