Fix description parsing in StepParseManifest

Requires to be submitted with:
 - https://review.tizen.org/gerrit/60480

Change-Id: I353b47bb554f189ce84c7e191c0fa4ea80984669

diff --git a/src/common/step/step_parse_manifest.cc b/src/common/step/step_parse_manifest.cc
index 2b75a9b..ea81a80 100644 (file)
--- a/src/common/step/step_parse_manifest.cc
+++ b/src/common/step/step_parse_manifest.cc
@@ -229,22 +229,22 @@ bool StepParseManifest::FillAuthorInfo(manifest_x* manifest) {
   return true;
 }
 
-bool StepParseManifest::FillDescription(manifest_x* manifest) {
-  std::shared_ptr<const tpk::parse::DescriptionInfo> description_info =
-      std::static_pointer_cast<const tpk::parse::DescriptionInfo>(
-          parser_->GetManifestData(app_keys::kDescriptionKey));
+bool StepParseManifest::FillDescriptionInfo(manifest_x* manifest) {
+  std::shared_ptr<const tpk::parse::DescriptionInfoList> description_info =
+      std::static_pointer_cast<const tpk::parse::DescriptionInfoList>(
+          parser_->GetManifestData(tpk::parse::DescriptionInfoList::Key()));
 
-  if (!description_info) {
-    LOG(ERROR) << "Description data has not been found.";
-    return false;
-  }
+  if (!description_info)
+    return true;
 
-  description_x* description = reinterpret_cast<description_x*>
-      (calloc(1, sizeof(description_x)));
-  description->text = strdup(description_info->description().c_str());
-  description->lang = !description_info->xml_lang().empty() ?
-      strdup(description_info->xml_lang().c_str()) : strdup(DEFAULT_LOCALE);
-  manifest->description = g_list_append(manifest->description, description);
+  for (auto& desc : description_info->descriptions) {
+    description_x* description = reinterpret_cast<description_x*>
+        (calloc(1, sizeof(description_x)));
+    description->text = strdup(desc.description().c_str());
+    description->lang = !desc.xml_lang().empty() ?
+        strdup(desc.xml_lang().c_str()) : strdup(DEFAULT_LOCALE);
+    manifest->description = g_list_append(manifest->description, description);
+  }
   return true;
 }
 
@@ -691,6 +691,8 @@ bool StepParseManifest::FillManifestX(manifest_x* manifest) {
     return false;
   if (!FillAuthorInfo(manifest))
     return false;
+  if (!FillDescriptionInfo(manifest))
+    return false;
   if (!FillAccounts())
     return false;
   if (!FillShortcuts())

diff --git a/src/common/step/step_parse_manifest.h b/src/common/step/step_parse_manifest.h
index aa3f883..6853a8a 100644 (file)
--- a/src/common/step/step_parse_manifest.h
+++ b/src/common/step/step_parse_manifest.h
@@ -64,7 +64,7 @@ class StepParseManifest : public common_installer::Step {
   bool FillInstallationInfo(manifest_x* manifest);
   bool FillPackageInfo(manifest_x* manifest);
   bool FillAuthorInfo(manifest_x* manifest);
-  bool FillDescription(manifest_x* manifest);
+  bool FillDescriptionInfo(manifest_x* manifest);
   bool FillPrivileges(manifest_x* manifest);
   bool FillWidgetApplication(manifest_x* manifest);
   bool FillServiceApplication(manifest_x* manifest);