From: Hyunjun Ko <zzoon.ko@samsung.com>
Date: Tue, 9 Apr 2013 08:04:09 +0000 (+0900)
Subject: 1. Set filename to title for images 2. Fix prevent defects
X-Git-Tag: 2.1b_release~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1c5d13de8b19d3c7aaab307edf5ed5c75696fece;p=platform%2Fcore%2Fmultimedia%2Flibmedia-service.git

1. Set filename to title for images 2. Fix prevent defects
---

diff --git a/packaging/libmedia-service.spec b/packaging/libmedia-service.spec
index 3338580..5bb91f3 100755
--- a/packaging/libmedia-service.spec
+++ b/packaging/libmedia-service.spec
@@ -1,6 +1,6 @@
 Name:       libmedia-service
 Summary:    Media information service library for multimedia applications.
-Version: 0.2.33
+Version: 0.2.34
 Release:    1
 Group:      System/Libraries
 License:    Apache License, Version 2.0
diff --git a/src/common/media-svc-util.c b/src/common/media-svc-util.c
index 6235755..b824595 100755
--- a/src/common/media-svc-util.c
+++ b/src/common/media-svc-util.c
@@ -748,8 +748,14 @@ int _media_svc_extract_image_metadata(media_svc_content_info_s *content_info, me
 		} else {
 			//media_svc_debug("time  is %s", buf);
 			ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.datetaken, buf);
-			if(ret != MEDIA_INFO_ERROR_NONE)
+			if(ret != MEDIA_INFO_ERROR_NONE) {
 				media_svc_error("strcpy error");
+			} else {
+				/* This is same as recorded_date */
+				ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.recorded_date, buf);
+				if(ret != MEDIA_INFO_ERROR_NONE)
+					media_svc_error("strcpy error");
+			}
 		}
 	}
 
@@ -787,6 +793,19 @@ int _media_svc_extract_image_metadata(media_svc_content_info_s *content_info, me
 	}
 
 	if (ed != NULL) exif_data_unref(ed);
+
+	/* Set filename to title for image media */
+	char *title = NULL;
+	title = _media_svc_get_title_from_filepath(content_info->path);
+	if (title) {
+		ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.title, title);
+		if(ret != MEDIA_INFO_ERROR_NONE)
+			media_svc_error("strcpy error");
+		SAFE_FREE(title);
+	} else {
+		media_svc_error("Can't extract title from filepath [%s]", content_info->path);
+	}
+
 #if 0
 	/* Extracting thumbnail */
 	char thumb_path[MEDIA_SVC_PATHNAME_SIZE + 1] = {0, };
@@ -1117,8 +1136,14 @@ int _media_svc_extract_media_metadata(sqlite3 *handle, media_svc_content_info_s
 		mmf_error = mm_file_get_attrs(tag, &err_attr_name, MM_FILE_TAG_RECDATE, &p, &size, NULL);
 		if ((!(extracted_field & MEDIA_SVC_EXTRACTED_FIELD_DESC)) && (mmf_error == MM_ERROR_NONE) && (size > 0)) {
 			ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.recorded_date, p);
-			if(ret != MEDIA_INFO_ERROR_NONE)
+			if(ret != MEDIA_INFO_ERROR_NONE) {
 				media_svc_error("strcpy error");
+			} else {
+				/* This is same as datetaken */
+				ret = __media_svc_malloc_and_strncpy(&content_info->media_meta.datetaken, p);
+				if(ret != MEDIA_INFO_ERROR_NONE)
+					media_svc_error("strcpy error");
+			}
 			//media_svc_debug("Recorded date : %s", content_info->media_meta.recorded_date);
 		} else {
 			SAFE_FREE(err_attr_name);
diff --git a/src/common/media-svc.c b/src/common/media-svc.c
index eee1936..818843c 100755
--- a/src/common/media-svc.c
+++ b/src/common/media-svc.c
@@ -384,8 +384,7 @@ int media_svc_insert_item_immediately(MediaSvcHandle *handle, media_svc_storage_
 			media_svc_error("thumbnail_request_from_db failed: %d", ret);
 		} else {
 			media_svc_debug("thumbnail_request_from_db success: %s", thumb_path);
-			ret = __media_svc_malloc_and_strncpy(&(content_info.thumbnail_path), thumb_path);
-			media_svc_retv_del_if(ret != MEDIA_INFO_ERROR_NONE, ret, &content_info);
+			__media_svc_malloc_and_strncpy(&(content_info.thumbnail_path), thumb_path);
 		}
 
 		if (content_info.media_meta.width <= 0)
@@ -901,8 +900,7 @@ int media_svc_refresh_item(MediaSvcHandle *handle, media_svc_storage_type_e stor
 			media_svc_error("thumbnail_request_from_db failed: %d", ret);
 		} else {
 			media_svc_debug("thumbnail_request_from_db success: %s", thumb_path);
-			ret = __media_svc_malloc_and_strncpy(&(content_info.thumbnail_path), thumb_path);
-			media_svc_retv_del_if(ret != MEDIA_INFO_ERROR_NONE, ret, &content_info);
+			__media_svc_malloc_and_strncpy(&(content_info.thumbnail_path), thumb_path);
 		}
 
 		if (content_info.media_meta.width <= 0)