From: Lukasz Bardeli <l.bardeli@samsung.com>
Date: Mon, 7 Sep 2015 08:36:06 +0000 (+0200)
Subject: [Content] Fix for scanDirectory missarg
X-Git-Tag: submit/tizen/20151026.073646^2^2~136^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d0aca22911e60336cfff362f028ae5704c62230;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

[Content] Fix for scanDirectory missarg

[Verification] Code compiles without error
Passrate 99.18% (245/243/0/2/0)

Change-Id: Ia7756b564f2bd6843049d28676fba48a75bb6988
Signed-off-by: Lukasz Bardeli <l.bardeli@samsung.com>
---

diff --git a/src/content/content_instance.cc b/src/content/content_instance.cc
index 9257f28a..3ea89cab 100755
--- a/src/content/content_instance.cc
+++ b/src/content/content_instance.cc
@@ -382,8 +382,9 @@ void ContentInstance::ContentManagerScanDirectory(const picojson::value& args, p
   cbData->instance = this;
   cbData->args = args;
 
-  if (ContentManager::getInstance()->scanDirectory(ScanDirectoryCallback, cbData).IsError()) {
-    ReportError(common::PlatformResult(common::ErrorCode::UNKNOWN_ERR, "Scan directory failed"), &out);
+  common::PlatformResult result = ContentManager::getInstance()->scanDirectory(ScanDirectoryCallback, cbData);
+  if (result.IsError()) {
+    ReportError(result, &out);
   }
 }
 
diff --git a/src/content/content_manager.cc b/src/content/content_manager.cc
index e11670b2..cfb35a11 100755
--- a/src/content/content_manager.cc
+++ b/src/content/content_manager.cc
@@ -804,7 +804,11 @@ PlatformResult ContentManager::scanDirectory(media_scan_completed_cb callback, R
   int ret = media_content_scan_folder(contentDirURI.c_str(), recursive, callback, (void*) cbData);
   if (ret != MEDIA_CONTENT_ERROR_NONE) {
     LoggerE("Scan folder failed in platform: %d", ret);
-    return PlatformResult(ErrorCode::UNKNOWN_ERR, "Scanning content directory failed");
+    if (MEDIA_CONTENT_ERROR_INVALID_PARAMETER == ret) {
+      return PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Scanning content directory failed");
+    } else {
+      return PlatformResult(ErrorCode::UNKNOWN_ERR, "Scanning content directory failed");
+    }
   }
   return PlatformResult(ErrorCode::NO_ERROR);
 }