fix installer args bug for -r option, add metadata filter pkgcmd for testing

Change-Id: I8ef01c1e05ad3f33f06ba48d66f3a6c690c0f2e7
Signed-off-by: junsuk77.oh <junsuk77.oh@samsung.com>

diff --git a/comm/pkgmgr_installer_config.h b/comm/pkgmgr_installer_config.h
index 2b82ad36c1f9d8f4d4652d16af3a208b87fe9435..aee72913a9863ac394a144408486952ed01f9fe4 100755 (executable)
--- a/comm/pkgmgr_installer_config.h
+++ b/comm/pkgmgr_installer_config.h
@@ -32,7 +32,7 @@ extern "C" {
 #endif
 
 /* Supported options */
-const char *short_opts = "k:l:i:d:c:m:t:o:rq";
+const char *short_opts = "k:l:i:d:c:m:t:o:r:q";
 const struct option long_opts[] = {
        { "session-id", 1, NULL, 'k' },
        { "license-path", 1, NULL, 'l' },

diff --git a/packaging/pkgmgr.spec b/packaging/pkgmgr.spec
index f4212081a58bac87113a10c552e1e84cc77c5286..43b082c56986c9ea8d16fbb8ab4bd7660fff5efa 100755 (executable)
--- a/packaging/pkgmgr.spec
+++ b/packaging/pkgmgr.spec
@@ -1,8 +1,8 @@
 #sbs-git:slp/pkgs/s/slp-pkgmgr pkgmgr 0.1.103 29b53909a5d6e8728429f0a188177eac691cb6ce
 Name:       pkgmgr
 Summary:    Packager Manager client library package
-Version:    0.2.66
-Release:    2
+Version:    0.2.68
+Release:    1
 Group:      System/Libraries
 License:    Apache License, Version 2.0
 Source0:    %{name}-%{version}.tar.gz

diff --git a/tool/pkg_info.c b/tool/pkg_info.c
index 3e8cad37a100f7ba006a9a693a3bfc6aa04dcf2f..b4686199d129dc0aa85adb59663a92b3373542d3 100755 (executable)
--- a/tool/pkg_info.c
+++ b/tool/pkg_info.c
@@ -133,12 +133,69 @@ static void __print_usage()
        printf("\tpkginfo --app-flt\n\n");
        printf("To add package filter values [Multiple values can be added]\n");
        printf("\tpkginfo --pkg-flt\n\n");
+       printf("To add metadata filter values\n");
+       printf("\tpkginfo --metadata-flt\n\n");
        printf("To get guest mode visibility of a particular application\n");
        printf("\tpkginfo --getvisibility <appid>\n\n");
        printf("To set guest mode visibility of a particular application\n");
        printf("\tpkginfo --setvisibility <appid>\n\n");
 }
 
+static int __app_list_cb(pkgmgrinfo_appinfo_h handle, void *user_data)
+{
+       char *appid = NULL;
+       pkgmgrinfo_appinfo_get_appid(handle, &appid);
+       printf("appid : %s\n", appid);
+       return 0;
+}
+
+static int __add_metadata_filter()
+{
+       int ret = 0;
+       pkgmgrinfo_appinfo_metadata_filter_h handle;
+       char *key = NULL;
+       char *value = NULL;
+
+       ret = pkgmgrinfo_appinfo_metadata_filter_create(&handle);
+       if (ret != PMINFO_R_OK){
+               printf("pkgmgrinfo_appinfo_metadata_filter_create() failed\n");
+               return ret;
+       }
+
+       printf("enter metadata - key\n");
+       key = __get_string_input_data();
+       printf("enter metadata - value\n");
+       value = __get_string_input_data();
+       if(strlen(value) == 0)
+               value = NULL;
+
+       printf("filter condition : key=[%s], value=[%s]\n", key, value);
+
+       ret = pkgmgrinfo_appinfo_metadata_filter_add(handle, key, value);
+       if (ret != PMINFO_R_OK){
+               printf("pkgmgrinfo_appinfo_metadata_filter_add() failed\n");
+               goto err;
+       }
+
+       ret = pkgmgrinfo_appinfo_metadata_filter_foreach(handle, __app_list_cb, NULL);
+       if (ret != PMINFO_R_OK){
+               printf("pkgmgrinfo_appinfo_metadata_filter_add() failed\n");
+               goto err;
+       }
+
+err:
+       pkgmgrinfo_appinfo_metadata_filter_destroy(handle);
+       if (key) {
+               free(key);
+               key = NULL;
+       }
+       if (value) {
+               free(value);
+               value = NULL;
+       }
+       return ret;
+}
+
 static int __add_app_filter()
 {
        int ret = 0;
@@ -1831,6 +1888,14 @@ int main(int argc, char *argv[])
                        } else {
                                goto end;
                        }
+               } else if (strcmp(argv[1], "--metadata-flt") == 0) {
+                       ret = __add_metadata_filter();
+                       if (ret == -1) {
+                               printf("Adding pkg filter failed\n");
+                               goto end;
+                       } else {
+                               goto end;
+                       }
                } else if (strcmp(argv[1], "--listapp") == 0) {
                        ret = __get_installed_app_list();
                        if (ret == -1) {