Fix title being inserted as an empty string

Change-Id: I6193f32315139378390e5cab7cfc6cf049011c13
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/src/common/media-svc-util.c b/src/common/media-svc-util.c
index 312e80b..4d80371 100644 (file)
--- a/src/common/media-svc-util.c
+++ b/src/common/media-svc-util.c
@@ -375,14 +375,13 @@ int _media_svc_set_media_info(media_svc_content_info_s *content_info, const char
        int ret = MS_MEDIA_ERR_NONE;
        char mime_type[256] = {0, };
        media_svc_media_type_e media_type;
+       struct stat st = { 0, };
 
        media_svc_retvm_if(!STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
 
        content_info->path = g_strdup(path);
-       media_svc_retv_del_if(content_info->path == NULL, MS_MEDIA_ERR_INTERNAL, content_info);
+       content_info->file_name = g_path_get_basename(path);
 
-       struct stat st;
-       memset(&st, 0, sizeof(struct stat));
        if (stat(path, &st) == 0) {
                content_info->modified_time = st.st_mtime;
                content_info->size = st.st_size;
@@ -402,9 +401,6 @@ int _media_svc_set_media_info(media_svc_content_info_s *content_info, const char
        content_info->media_uuid = __media_info_generate_uuid();
        media_svc_retv_del_if(content_info->media_uuid == NULL, MS_MEDIA_ERR_INTERNAL, content_info);
 
-       content_info->file_name = g_path_get_basename(path);
-       media_svc_retv_del_if(content_info->file_name == NULL, MS_MEDIA_ERR_INTERNAL, content_info);
-
        ret = __media_svc_get_mime_type(path, mime_type);
        media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, content_info);
 
@@ -416,7 +412,7 @@ int _media_svc_set_media_info(media_svc_content_info_s *content_info, const char
        content_info->mime_type = g_strdup(mime_type);
        media_svc_retv_del_if(content_info->mime_type == NULL, MS_MEDIA_ERR_INTERNAL, content_info);
 
-       media_svc_sec_debug("path[%s], media_type[%d]", path, media_type);
+       media_svc_sec_debug("path[%s], media_type[%d]", content_info->path, media_type);
 
        content_info->media_type = media_type;
 

diff --git a/src/common/media-svc.c b/src/common/media-svc.c
index c8837f0..088d441 100755 (executable)
--- a/src/common/media-svc.c
+++ b/src/common/media-svc.c
@@ -193,8 +193,7 @@ int media_svc_insert_item_bulk(sqlite3 *handle, const char *storage_id, const ch
        media_svc_retvm_if(!STRING_VALID(storage_id), MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
        media_svc_retvm_if(!STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
 
-       media_svc_content_info_s content_info;
-       memset(&content_info, 0, sizeof(media_svc_content_info_s));
+       media_svc_content_info_s content_info = { 0, };
 
        /*Set media info*/
        ret = _media_svc_set_media_info(&content_info, storage_id, path, false);
@@ -261,8 +260,7 @@ int media_svc_insert_item_immediately(sqlite3 *handle, const char *storage_id, c
        media_svc_retvm_if(!STRING_VALID(storage_id), MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
        media_svc_retvm_if(!STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
 
-       media_svc_content_info_s content_info;
-       memset(&content_info, 0, sizeof(media_svc_content_info_s));
+       media_svc_content_info_s content_info = { 0, };
 
        /*Set media info*/
        ret = _media_svc_set_media_info(&content_info, storage_id, path, false);
@@ -448,11 +446,10 @@ int media_svc_refresh_item(sqlite3 *handle, bool is_direct, const char *storage_
        media_svc_noti_item *noti_item = NULL;
 
        media_svc_retvm_if(handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
-       media_svc_retvm_if(!STRING_VALID(storage_id), MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
        media_svc_retvm_if(!STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
 
        /*Set media info*/
-       ret = _media_svc_set_media_info(&content_info, storage_id, path, true);
+       ret = _media_svc_set_media_info(&content_info, NULL, path, true);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
        /* Initialize thumbnail information to remake thumbnail. */