Remove 'metadata' and 'category' parsing from pkgmgr_process_* functions 29/59029/6 accepted/tizen/common/20160304.194921 accepted/tizen/common/20160307.153143 accepted/tizen/ivi/20160304.105557 accepted/tizen/mobile/20160304.105440 accepted/tizen/tv/20160304.105458 accepted/tizen/wearable/20160304.105530 submit/tizen/20160303.090142 submit/tizen/20160304.063745
authorTomasz Iwanek <t.iwanek@samsung.com>
Fri, 5 Feb 2016 12:10:01 +0000 (13:10 +0100)
committerTomasz Iwanek <t.iwanek@samsung.com>
Thu, 3 Mar 2016 09:00:00 +0000 (01:00 -0800)
 - pkgmgr_process_* functions will no longer call any plugin,
 - pkgmgr_parse_* functions will follow old behaviour,
 - export __metadata_t and __category_t structures for app-installer plugin loading,
 - export enumaration for metadata plugin call.

Following changes should be submitted together:
 - https://review.tizen.org/gerrit/#/c/59029/
 - https://review.tizen.org/gerrit/#/c/59028/
 - https://review.tizen.org/gerrit/#/c/59030/
 - https://review.tizen.org/gerrit/#/c/59031/

Change-Id: Ifdb2acd914077ce8e3fb21b6117d1c192f5834e5

parser/pkgmgr_parser.c
parser/pkgmgr_parser.h

index 1faf931..e2bcc91 100644 (file)
 #define BUFSIZE 4096
 #define GLOBAL_USER tzplatform_getuid(TZ_SYS_GLOBALAPP_USER)
 
-/* operation_type */
-typedef enum {
-       ACTION_INSTALL = 0,
-       ACTION_UPGRADE,
-       ACTION_UNINSTALL,
-       ACTION_FOTA,
-       ACTION_MAX
-} ACTION_TYPE;
-
 /* plugin process_type */
 typedef enum {
        PLUGIN_PRE_PROCESS = 0,
        PLUGIN_POST_PROCESS
 } PLUGIN_PROCESS_TYPE;
 
-typedef struct {
-       const char *key;
-       const char *value;
-} __metadata_t;
-
-typedef struct {
-       const char *name;
-} __category_t;
-
 const char *package;
 
 static int __ps_process_label(xmlTextReaderPtr reader, label_x *label);
@@ -2187,14 +2169,6 @@ API int pkgmgr_parser_process_manifest_x_for_installation(manifest_x* mfx, const
        ret = pkgmgr_parser_insert_manifest_info_in_db(mfx);
        retvm_if(ret == PMINFO_R_ERROR, PMINFO_R_ERROR, "DB Insert failed");
        _LOGD("DB Insert Success\n");
-
-       ret = __ps_process_metadata_parser(mfx, ACTION_INSTALL);
-       if (ret == -1)
-               _LOGD("Creating metadata parser failed\n");
-
-       ret = __ps_process_category_parser(mfx, ACTION_INSTALL);
-       if (ret == -1)
-               _LOGD("Creating category parser failed\n");
        xmlCleanupParser();
 
        return PMINFO_R_OK;
@@ -2210,13 +2184,6 @@ API int pkgmgr_parser_process_usr_manifest_x_for_installation(manifest_x* mfx, c
        ret = pkgmgr_parser_insert_manifest_info_in_usr_db(mfx, uid);
        retvm_if(ret == PMINFO_R_ERROR, PMINFO_R_ERROR, "DB Insert failed");
        _LOGD("DB Insert Success\n");
-
-       ret = __ps_process_metadata_parser(mfx, ACTION_INSTALL);
-       if (ret == -1)
-               _LOGD("Creating metadata parser failed\n");
-       ret = __ps_process_category_parser(mfx, ACTION_INSTALL);
-       if (ret == -1)
-               _LOGD("Creating category parser failed\n");
        xmlCleanupParser();
        return PMINFO_R_OK;
 }
@@ -2393,14 +2360,6 @@ API int pkgmgr_parser_process_manifest_x_for_upgrade(manifest_x* mfx, const char
        ret = pkgmgr_parser_update_manifest_info_in_db(mfx);
        retvm_if(ret == PMINFO_R_ERROR, PMINFO_R_ERROR, "DB Insert failed");
        _LOGD("DB Update Success\n");
-
-       ret = __ps_process_metadata_parser(mfx, ACTION_UPGRADE);
-       if (ret == -1){
-               _LOGD("Upgrade metadata parser failed\n");
-       }
-       ret = __ps_process_category_parser(mfx, ACTION_UPGRADE);
-       if (ret == -1)
-               _LOGD("Creating category parser failed\n");
        pkgmgrinfo_pkginfo_destroy_pkginfo(handle);
        xmlCleanupParser();
 
@@ -2423,13 +2382,6 @@ API int pkgmgr_parser_process_usr_manifest_x_for_upgrade(manifest_x* mfx, const
        ret = pkgmgr_parser_update_manifest_info_in_usr_db(mfx, uid);
        retvm_if(ret == PMINFO_R_ERROR, PMINFO_R_ERROR, "DB Insert failed");
        _LOGD("DB Update Success\n");
-
-       ret = __ps_process_metadata_parser(mfx, ACTION_UPGRADE);
-       if (ret == -1)
-               _LOGD("Upgrade metadata parser failed\n");
-       ret = __ps_process_category_parser(mfx, ACTION_UPGRADE);
-       if (ret == -1)
-               _LOGD("Creating category parser failed\n");
        pkgmgrinfo_pkginfo_destroy_pkginfo(handle);
        xmlCleanupParser();
 
@@ -2522,15 +2474,6 @@ API int pkgmgr_parser_process_manifest_x_for_uninstallation(manifest_x* mfx, con
 
        int ret = -1;
        xmlInitParser();
-
-       ret = __ps_process_metadata_parser(mfx, ACTION_UNINSTALL);
-       if (ret == -1)
-               _LOGD("Removing metadata parser failed\n");
-
-       ret = __ps_process_category_parser(mfx, ACTION_UNINSTALL);
-       if (ret == -1)
-               _LOGD("Creating category parser failed\n");
-
        ret = pkgmgr_parser_delete_manifest_info_from_db(mfx);
        if (ret == -1)
                _LOGD("DB Delete failed\n");
@@ -2549,14 +2492,6 @@ API int pkgmgr_parser_process_usr_manifest_x_for_uninstallation(manifest_x* mfx,
        int ret = -1;
        xmlInitParser();
 
-       ret = __ps_process_metadata_parser(mfx, ACTION_UNINSTALL);
-       if (ret == -1)
-               _LOGD("Removing metadata parser failed\n");
-
-       ret = __ps_process_category_parser(mfx, ACTION_UNINSTALL);
-       if (ret == -1)
-               _LOGD("Creating category parser failed\n");
-
        ret = pkgmgr_parser_delete_manifest_info_from_usr_db(mfx, uid);
        if (ret == -1)
                _LOGD("DB Delete failed\n");
index b0b39f6..5ece2e3 100644 (file)
@@ -61,6 +61,31 @@ extern "C" {
 #define GLOBAL_USER tzplatform_getuid(TZ_SYS_GLOBALAPP_USER)
 
 /**
+ * @brief Structure which is used by metadata plugin
+ */
+typedef struct {
+       const char *key;
+       const char *value;
+} __metadata_t;
+
+
+/**
+ * @brief Structure which is used by category plugin
+ */
+typedef struct {
+       const char *name;
+} __category_t;
+
+/* operation_type */
+typedef enum {
+       ACTION_INSTALL = 0,
+       ACTION_UPGRADE,
+       ACTION_UNINSTALL,
+       ACTION_FOTA,
+       ACTION_MAX
+} ACTION_TYPE;
+
+/**
  * @brief API return values
  */
 enum {