[Content] - Fix procedure for calling error callback

Change-Id: I911997be7db55fe14a9a74fed864ccf2ddb2cc93
Signed-off-by: Andrzej Popowski <a.popowski@samsung.com>

diff --git a/src/content/content.gyp b/src/content/content.gyp
index b732b7b5d7b606188fd239e657a6a627b0cbeaf9..9cc2f8c3deea8db571b2b0343a9980d88c5c8e93 100755 (executable)
--- a/src/content/content.gyp
+++ b/src/content/content.gyp
@@ -26,7 +26,7 @@
             'packages': [
               'capi-content-media-content',
               'capi-media-metadata-extractor',
-                                     'capi-base-common',
+              'capi-base-common',
               'dlog',
             ]
           },

diff --git a/src/content/content_instance.cc b/src/content/content_instance.cc
index 2bed6d7df284b7162930b09901509ddf3395d083..bb2a3608b5b194ecba826b389676ea07e8fda47c 100755 (executable)
--- a/src/content/content_instance.cc
+++ b/src/content/content_instance.cc
@@ -109,10 +109,15 @@ static gboolean CompletedCallback(const std::shared_ptr<ReplyCallbackData>& user
 static void* WorkThread(const std::shared_ptr<ReplyCallbackData>& user_data) {
   LoggerD("entered");
 
+  int ret = MEDIA_CONTENT_ERROR_NONE;
   ContentCallbacks cbType = user_data->cbType;
   switch(cbType) {
     case ContentManagerUpdatebatchCallback: {
-      ContentManager::getInstance()->updateBatch(user_data->args);
+      ret = ContentManager::getInstance()->updateBatch(user_data->args);
+      if(ret != MEDIA_CONTENT_ERROR_NONE){
+        LoggerD("UpdateBatch Failed");
+        user_data->isSuccess = ContentManager::getInstance()->convertError(ret);
+      }
       break;
     }
     case ContentManagerGetdirectoriesCallback: {
@@ -126,9 +131,9 @@ static void* WorkThread(const std::shared_ptr<ReplyCallbackData>& user_data) {
     case ContentManagerScanfileCallback: {
       std::string contentURI = user_data->args.get("contentURI").get<std::string>();
       std::string real_path = common::VirtualFs::GetInstance().GetRealPath(contentURI);
-      int res = ContentManager::getInstance()->scanFile(real_path);
-      if (res != MEDIA_CONTENT_ERROR_NONE) {
-        LOGGER(ERROR) << "Scan file failed, error: " << res;
+      ret = ContentManager::getInstance()->scanFile(real_path);
+      if (ret != MEDIA_CONTENT_ERROR_NONE) {
+        LOGGER(ERROR) << "Scan file failed, error: " << ret;
         common::PlatformResult err(common::ErrorCode::UNKNOWN_ERR, "Scan file failed.");
         user_data->isSuccess = err;
       }

diff --git a/src/content/content_manager.cc b/src/content/content_manager.cc
index 6e1f0f2fa4b2aaa48550c402dcbc1d7db8f8fc1e..8e092bb8819ede851a201c6ee24b0b9f82d3b78b 100755 (executable)
--- a/src/content/content_manager.cc
+++ b/src/content/content_manager.cc
@@ -895,7 +895,7 @@ PlatformResult ContentManager::unSetV2ChangeListener(media_content_noti_h* noti_
 void ContentManager::createPlaylist(std::string name,
   const std::shared_ptr<ReplyCallbackData>& user_data) {
   LoggerD("Enter");
-  media_playlist_h     playlist = NULL;
+  media_playlist_h playlist = NULL;
 
   int ret = media_playlist_insert_to_db(name.c_str(),&playlist);
   std::unique_ptr<std::remove_pointer<media_playlist_h>::type, int(*)(media_playlist_h)>
@@ -961,7 +961,7 @@ void ContentManager::getPlaylists(const std::shared_ptr<ReplyCallbackData>& user
 
   LoggerD("Enter");
   int ret;
-  filter_h     filter = nullptr;
+  filter_h filter = nullptr;
   media_filter_create(&filter);
   std::unique_ptr<std::remove_pointer<filter_h>::type, int(*)(filter_h)>
       filter_ptr(filter, &media_filter_destroy); // automatically release the memory
@@ -1027,8 +1027,16 @@ int ContentManager::updateBatch(picojson::value args) {
     media_info_h media = NULL;
     ret = media_info_get_media_from_db(id.c_str(), &media);
     if (media != NULL && ret == MEDIA_CONTENT_ERROR_NONE) {
-      setContent(media, content);
+      ret = setContent(media, content);
+      if(ret != MEDIA_CONTENT_ERROR_NONE){
+        LoggerE("setContent failed");
+        return ret;
+      }
+                       
       ret = media_info_update_to_db(media);
+      if(ret != MEDIA_CONTENT_ERROR_NONE){
+        LoggerE("update to db failed");
+      }
       media_info_destroy(media);
     } else {
       return ret;