X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcommon%2Fmedia-svc.c;h=5f8d1c105403a2d9f7477e612ca5e904e72f9365;hb=67a624cd32e5ce57520827e916ac27e7c607ac6a;hp=6ae46f31c1398f26e21750e3862d18fcd437b939;hpb=9fc97c52fd60e99d1d56c955f193483f3e3a8c39;p=platform%2Fcore%2Fmultimedia%2Flibmedia-service.git

diff --git a/src/common/media-svc.c b/src/common/media-svc.c
index 6ae46f3..5f8d1c1 100755
--- a/src/common/media-svc.c
+++ b/src/common/media-svc.c
@@ -19,9 +19,6 @@
  *
  */
 
-#include <string.h>
-#include <errno.h>
-#include "media-svc.h"
 #include "media-svc-media.h"
 #include "media-svc-debug.h"
 #include "media-svc-util.h"
@@ -32,22 +29,13 @@
 #include "media-svc-noti.h"
 #include "media-svc-storage.h"
 
-static __thread int g_media_svc_item_validity_data_cnt = 1;
-static __thread int g_media_svc_item_validity_cur_data_cnt = 0;
-
-static __thread int g_media_svc_insert_item_data_cnt = 1;
-static __thread int g_media_svc_insert_item_cur_data_cnt = 0;
-
-static __thread int g_media_svc_update_item_data_cnt = 1;
-static __thread int g_media_svc_update_item_cur_data_cnt = 0;
-
-static __thread int g_media_svc_insert_folder_data_cnt = 1;
-static __thread int g_media_svc_insert_folder_cur_data_cnt = 0;
+//static __thread int g_media_svc_data_cnt = 0;
+static __thread int g_media_svc_cur_data_cnt = 0;
 
 /* Flag for items to be published by notification */
-static __thread int g_insert_with_noti = FALSE;
+static __thread bool g_insert_with_noti = false;
 
-#define BATCH_REQUEST_MAX 300
+#define BATCH_ITEM_COUNT_MAX 100
 
 int media_svc_get_user_version(sqlite3 *handle, int *user_version)
 {
@@ -61,100 +49,94 @@ int media_svc_create_table(uid_t uid)
 
 	media_svc_debug_fenter();
 
-	ret = _media_svc_init_table_query(MEDIA_SVC_DB_TABLE_MEDIA);
+	ret = _media_svc_init_table_query();
 	if (ret != MS_MEDIA_ERR_NONE) {
 		media_svc_error("_media_svc_init_table_query fail.");
 		goto ERROR;
 	}
 
 	/*create media table*/
-	ret = _media_svc_make_table_query(MEDIA_SVC_DB_TABLE_MEDIA, MEDIA_SVC_DB_LIST_MEDIA, uid);
+	ret = _media_svc_make_table_query(DB_TABLE_MEDIA, DB_LIST_MEDIA, uid);
 	if (ret != MS_MEDIA_ERR_NONE) {
 		media_svc_error("_media_svc_make_table_query fail.");
 		goto ERROR;
 	}
 
 	/*create folder table*/
-	ret = _media_svc_make_table_query(MEDIA_SVC_DB_TABLE_FOLDER, MEDIA_SVC_DB_LIST_FOLDER, uid);
+	ret = _media_svc_make_table_query(DB_TABLE_FOLDER, DB_LIST_FOLDER, uid);
 	if (ret != MS_MEDIA_ERR_NONE) {
 		media_svc_error("_media_svc_make_table_query fail.");
 		goto ERROR;
 	}
 
 	/*create playlist_map table*/
-	ret = _media_svc_make_table_query(MEDIA_SVC_DB_TABLE_PLAYLIST_MAP, MEDIA_SVC_DB_LIST_PLAYLIST_MAP, uid);
+	ret = _media_svc_make_table_query(DB_TABLE_PLAYLIST_MAP, DB_LIST_PLAYLIST_MAP, uid);
 	if (ret != MS_MEDIA_ERR_NONE) {
 		media_svc_error("_media_svc_make_table_query fail.");
 		goto ERROR;
 	}
 
 	/*create playlist table*/
-	ret = _media_svc_make_table_query(MEDIA_SVC_DB_TABLE_PLAYLIST, MEDIA_SVC_DB_LIST_PLAYLIST, uid);
+	ret = _media_svc_make_table_query(DB_TABLE_PLAYLIST, DB_LIST_PLAYLIST, uid);
 	if (ret != MS_MEDIA_ERR_NONE) {
 		media_svc_error("_media_svc_make_table_query fail.");
 		goto ERROR;
 	}
 
 	/* create album table*/
-	ret = _media_svc_make_table_query(MEDIA_SVC_DB_TABLE_ALBUM, MEDIA_SVC_DB_LIST_ALBUM, uid);
+	ret = _media_svc_make_table_query(DB_TABLE_ALBUM, DB_LIST_ALBUM, uid);
 	if (ret != MS_MEDIA_ERR_NONE) {
 		media_svc_error("_media_svc_make_table_query fail.");
 		goto ERROR;
 	}
 
 	/*create tag_map table*/
-	ret = _media_svc_make_table_query(MEDIA_SVC_DB_TABLE_TAG_MAP, MEDIA_SVC_DB_LIST_TAG_MAP, uid);
+	ret = _media_svc_make_table_query(DB_TABLE_TAG_MAP, DB_LIST_TAG_MAP, uid);
 	if (ret != MS_MEDIA_ERR_NONE) {
 		media_svc_error("_media_svc_make_table_query fail.");
 		goto ERROR;
 	}
 
 	/*create tag table*/
-	ret = _media_svc_make_table_query(MEDIA_SVC_DB_TABLE_TAG, MEDIA_SVC_DB_LIST_TAG, uid);
+	ret = _media_svc_make_table_query(DB_TABLE_TAG, DB_LIST_TAG, uid);
 	if (ret != MS_MEDIA_ERR_NONE) {
 		media_svc_error("_media_svc_make_table_query fail.");
 		goto ERROR;
 	}
 
 	/*create bookmark table*/
-	ret = _media_svc_make_table_query(MEDIA_SVC_DB_TABLE_BOOKMARK, MEDIA_SVC_DB_LIST_BOOKMARK, uid);
+	ret = _media_svc_make_table_query(DB_TABLE_BOOKMARK, DB_LIST_BOOKMARK, uid);
 	if (ret != MS_MEDIA_ERR_NONE) {
 		media_svc_error("_media_svc_make_table_query fail.");
 		goto ERROR;
 	}
 
 	/*create storage table from tizen 2.4 */
-	ret = _media_svc_make_table_query(MEDIA_SVC_DB_TABLE_STORAGE, MEDIA_SVC_DB_LIST_STORAGE, uid);
+	ret = _media_svc_make_table_query(DB_TABLE_STORAGE, DB_LIST_STORAGE, uid);
 	if (ret != MS_MEDIA_ERR_NONE) {
 		media_svc_error("_media_svc_make_table_query fail.");
 		goto ERROR;
 	}
 
 	/*create face table. from tizen 3.0*/
-	ret = _media_svc_make_table_query(MEDIA_SVC_DB_TABLE_FACE_SCAN_LIST, MEDIA_SVC_DB_LIST_FACE_SCAN_LIST, uid);
+	ret = _media_svc_make_table_query(DB_TABLE_FACE_SCAN_LIST, DB_LIST_FACE_SCAN_LIST, uid);
 	if (ret != MS_MEDIA_ERR_NONE) {
 		media_svc_error("_media_svc_make_table_query fail.");
 		goto ERROR;
 	}
 
-	ret = _media_svc_make_table_query(MEDIA_SVC_DB_TABLE_FACE, MEDIA_SVC_DB_LIST_FACE, uid);
+	ret = _media_svc_make_table_query(DB_TABLE_FACE, DB_LIST_FACE, uid);
 	if (ret != MS_MEDIA_ERR_NONE) {
 		media_svc_error("_media_svc_make_table_query fail.");
 		goto ERROR;
 	}
 
-	sql = sqlite3_mprintf("pragma user_version = %d;", LATEST_VERSION_NUMBER);
+	sql = sqlite3_mprintf("pragma user_version = %d;", LATEST_DB_VERSION);
 	ret = _media_svc_sql_query(sql, uid);
 	if (ret != MS_MEDIA_ERR_NONE) {
 		media_svc_error("user_version update fail.");
 		goto ERROR;
 	}
-
-	_media_svc_destroy_table_query();
-
-	media_svc_debug_fleave();
-
-	return MS_MEDIA_ERR_NONE;
 ERROR:
 	_media_svc_destroy_table_query();
 
@@ -165,45 +147,24 @@ ERROR:
 
 int media_svc_check_item_exist_by_path(sqlite3 *handle, const char *storage_id, const char *path)
 {
-	int ret = MS_MEDIA_ERR_NONE;
-	int count = -1;
-
-	ret = _media_svc_count_record_with_path(handle, storage_id, path, &count);
-	media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
-
-	if (count > 0) {
-		media_svc_debug("item is exist in database");
-		return MS_MEDIA_ERR_NONE;
-	} else {
-		media_svc_debug("item is not exist in database");
-		return MS_MEDIA_ERR_DB_NO_RECORD;
-	}
-
-	return MS_MEDIA_ERR_NONE;
+	return _media_svc_check_data_by_path(handle, path);
 }
 
 int media_svc_get_modified_time(sqlite3 *handle, const char *storage_id, const char *path, int *modified_time)
 {
-	return _media_svc_get_modified_time(handle, storage_id, path, modified_time);
+	return _media_svc_get_modified_time(handle, path, modified_time);
 }
 
-int media_svc_insert_item_begin(int data_cnt, int with_noti, int from_pid)
+int media_svc_insert_item_begin(bool with_noti, int from_pid)
 {
-	media_svc_debug("Transaction data count : [%d]", data_cnt);
-
-	media_svc_retvm_if(data_cnt < 1, MS_MEDIA_ERR_INVALID_PARAMETER, "data_cnt shuld be bigger than 1");
-
-	g_media_svc_insert_item_data_cnt = data_cnt;
-	g_media_svc_insert_item_cur_data_cnt = 0;
+	g_media_svc_cur_data_cnt = 0;
 
 	/* Prepare for making noti item list */
 	if (with_noti) {
 		media_svc_debug("making noti list from pid[%d]", from_pid);
-		if (_media_svc_create_noti_list(data_cnt) != MS_MEDIA_ERR_NONE)
-			return MS_MEDIA_ERR_OUT_OF_MEMORY;
-
+		_media_svc_initialize_noti_list();
 		_media_svc_set_noti_from_pid(from_pid);
-		g_insert_with_noti = TRUE;
+		g_insert_with_noti = true;
 	}
 
 	return MS_MEDIA_ERR_NONE;
@@ -215,20 +176,17 @@ int media_svc_insert_item_end(uid_t uid)
 
 	media_svc_debug_fenter();
 
-	if (g_media_svc_insert_item_cur_data_cnt > 0) {
-
-		ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_INSERT_ITEM, uid);
+	if (g_media_svc_cur_data_cnt > 0) {
+		ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_SCANNER, uid);
 		if (g_insert_with_noti) {
 			media_svc_debug("sending noti list");
-			_media_svc_publish_noti_list(g_media_svc_insert_item_cur_data_cnt);
-			_media_svc_destroy_noti_list(g_media_svc_insert_item_cur_data_cnt);
-			g_insert_with_noti = FALSE;
+			_media_svc_publish_noti_list();
+			g_insert_with_noti = false;
 			_media_svc_set_noti_from_pid(-1);
 		}
 	}
 
-	g_media_svc_insert_item_data_cnt = 1;
-	g_media_svc_insert_item_cur_data_cnt = 0;
+	g_media_svc_cur_data_cnt = 0;
 
 	return ret;
 }
@@ -237,84 +195,60 @@ int media_svc_insert_item_bulk(sqlite3 *handle, const char *storage_id, ms_user_
 {
 	int ret = MS_MEDIA_ERR_NONE;
 	char folder_uuid[MEDIA_SVC_UUID_SIZE + 1] = {0, };
-	media_svc_media_type_e media_type;
 
 	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");
-	media_svc_retvm_if(_media_svc_check_storage_type(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
+	media_svc_retvm_if(!_media_svc_is_valid_storage_type(storage_type), MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
 
 	media_svc_content_info_s content_info;
 	memset(&content_info, 0, sizeof(media_svc_content_info_s));
 
 	/*Set media info*/
 	/* if drm_contentinfo is not NULL, the file is OMA DRM.*/
-	ret = _media_svc_set_media_info(&content_info, storage_id, storage_type, path, &media_type, FALSE);
+	ret = _media_svc_set_media_info(&content_info, storage_id, storage_type, path, false);
 	if (ret != MS_MEDIA_ERR_NONE)
 		return ret;
 
-	if (media_type == MEDIA_SVC_MEDIA_TYPE_OTHER
-	|| (media_type == MEDIA_SVC_MEDIA_TYPE_PVR)
-	|| (media_type == MEDIA_SVC_MEDIA_TYPE_UHD)
-	|| (media_type == MEDIA_SVC_MEDIA_TYPE_SCSA))
-		media_svc_debug("Do nothing[%d]", media_type);
-	else if (media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE)
+	switch (content_info.media_type) {
+	case MEDIA_SVC_MEDIA_TYPE_IMAGE:
 		ret = _media_svc_extract_image_metadata(&content_info);
-	else
-		ret = _media_svc_extract_media_metadata(handle, &content_info, uid);
+		break;
+	case MEDIA_SVC_MEDIA_TYPE_VIDEO:
+	case MEDIA_SVC_MEDIA_TYPE_SOUND:
+	case MEDIA_SVC_MEDIA_TYPE_MUSIC:
+		ret = _media_svc_extract_media_metadata(handle, true, &content_info, uid);
+		break;
+	default:
+		/* The 'TITLE' should always be filled in */
+		content_info.media_meta.title = _media_svc_get_title_by_path(content_info.path);
+		break;
+	}
+
 	media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
 
 	/*Set or Get folder id*/
-	ret = _media_svc_get_and_append_folder_id_by_path(handle, storage_id, path, storage_type, folder_uuid, uid);
+	ret = _media_svc_get_and_append_folder_id_by_path(handle, true, storage_id, path, storage_type, folder_uuid, uid);
 	media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
 
 	content_info.folder_uuid = g_strdup(folder_uuid);
 	media_svc_retv_del_if(content_info.folder_uuid == NULL, MS_MEDIA_ERR_INTERNAL, &content_info);
 
-	if (g_media_svc_insert_item_data_cnt == 1) {
-
-		ret = _media_svc_insert_item_with_data(handle, storage_id, &content_info, FALSE, uid);
-		media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
-
-		if (g_insert_with_noti)
-			_media_svc_insert_item_to_noti_list(&content_info, g_media_svc_insert_item_cur_data_cnt++);
-
-	} else if (g_media_svc_insert_item_cur_data_cnt < (g_media_svc_insert_item_data_cnt - 1)) {
-
-		ret = _media_svc_insert_item_with_data(handle, storage_id, &content_info, TRUE, uid);
-		media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
-
-		if (g_insert_with_noti)
-			_media_svc_insert_item_to_noti_list(&content_info, g_media_svc_insert_item_cur_data_cnt);
-
-		g_media_svc_insert_item_cur_data_cnt++;
+	ret = _media_svc_insert_item_with_data(true, &content_info, true, uid);
+	media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
 
-	} else if (g_media_svc_insert_item_cur_data_cnt == (g_media_svc_insert_item_data_cnt - 1)) {
+	if (g_insert_with_noti)
+		_media_svc_insert_item_to_noti_list(&content_info);
 
-		ret = _media_svc_insert_item_with_data(handle, storage_id, &content_info, TRUE, uid);
+	/* To avoid over-occupying memory, update per BATCH_ITEM_COUNT_MAX. */
+	if (++g_media_svc_cur_data_cnt == BATCH_ITEM_COUNT_MAX) {
+		ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_SCANNER, uid);
 		media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
 
 		if (g_insert_with_noti)
-			_media_svc_insert_item_to_noti_list(&content_info, g_media_svc_insert_item_cur_data_cnt);
-
-		ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_INSERT_ITEM, uid);
-		media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
-
-		if (g_insert_with_noti) {
-			_media_svc_publish_noti_list(g_media_svc_insert_item_cur_data_cnt + 1);
-			_media_svc_destroy_noti_list(g_media_svc_insert_item_cur_data_cnt + 1);
-
-			/* Recreate noti list */
-			ret = _media_svc_create_noti_list(g_media_svc_insert_item_data_cnt);
-			media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
-		}
+			_media_svc_publish_noti_list();
 
-		g_media_svc_insert_item_cur_data_cnt = 0;
-
-	} else {
-		media_svc_error("Error in media_svc_insert_item_bulk");
-		_media_svc_destroy_content_info(&content_info);
-		return MS_MEDIA_ERR_INTERNAL;
+		g_media_svc_cur_data_cnt = 0;
 	}
 
 	_media_svc_destroy_content_info(&content_info);
@@ -326,36 +260,39 @@ int media_svc_insert_item_immediately(sqlite3 *handle, const char *storage_id, m
 {
 	int ret = MS_MEDIA_ERR_NONE;
 	char folder_uuid[MEDIA_SVC_UUID_SIZE + 1] = {0, };
-	media_svc_media_type_e media_type;
 
 	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");
-	media_svc_retvm_if(_media_svc_check_storage_type(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
+	media_svc_retvm_if(!_media_svc_is_valid_storage_type(storage_type), MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
 
 	media_svc_content_info_s content_info;
 	memset(&content_info, 0, sizeof(media_svc_content_info_s));
 
 	/*Set media info*/
-	ret = _media_svc_set_media_info(&content_info, storage_id, storage_type, path, &media_type, FALSE);
+	ret = _media_svc_set_media_info(&content_info, storage_id, storage_type, path, false);
 	if (ret != MS_MEDIA_ERR_NONE)
 		return ret;
 
-	if (media_type == MEDIA_SVC_MEDIA_TYPE_OTHER
-	|| (media_type == MEDIA_SVC_MEDIA_TYPE_PVR)
-	|| (media_type == MEDIA_SVC_MEDIA_TYPE_UHD)
-	|| (media_type == MEDIA_SVC_MEDIA_TYPE_SCSA)) {
-		/*Do nothing.*/
-	} else if (media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE) {
+	switch (content_info.media_type) {
+	case MEDIA_SVC_MEDIA_TYPE_IMAGE:
 		ret = _media_svc_extract_image_metadata(&content_info);
-	} else {
-		ret = _media_svc_extract_media_metadata(handle, &content_info, uid);
+		break;
+	case MEDIA_SVC_MEDIA_TYPE_VIDEO:
+	case MEDIA_SVC_MEDIA_TYPE_SOUND:
+	case MEDIA_SVC_MEDIA_TYPE_MUSIC:
+		ret = _media_svc_extract_media_metadata(handle, false, &content_info, uid);
+		break;
+	default:
+		/* The 'TITLE' should always be filled in */
+		content_info.media_meta.title = _media_svc_get_title_by_path(content_info.path);
+		break;
 	}
 
 	media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
 
 	/*Set or Get folder id*/
-	ret = _media_svc_get_and_append_folder_id_by_path(handle, storage_id, path, storage_type, folder_uuid, uid);
+	ret = _media_svc_get_and_append_folder_id_by_path(handle, false, storage_id, path, storage_type, folder_uuid, uid);
 	media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
 
 	content_info.folder_uuid = g_strdup(folder_uuid);
@@ -363,20 +300,20 @@ int media_svc_insert_item_immediately(sqlite3 *handle, const char *storage_id, m
 
 	/* Extracting thumbnail */
 	if (content_info.thumbnail_path == NULL) {
-		if (media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE || media_type == MEDIA_SVC_MEDIA_TYPE_VIDEO) {
+		if (content_info.media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE || content_info.media_type == MEDIA_SVC_MEDIA_TYPE_VIDEO) {
 			char thumb_path[MEDIA_SVC_PATHNAME_SIZE + 1] = {0, };
 
-			ret = _media_svc_create_thumbnail(content_info.path, thumb_path, media_type, uid);
+			ret = _media_svc_create_thumbnail(content_info.path, thumb_path, content_info.media_type, uid);
 			if (ret == MS_MEDIA_ERR_NONE)
 				content_info.thumbnail_path = g_strdup(thumb_path);
 		}
 	}
 
-	ret = _media_svc_insert_item_with_data(handle, storage_id, &content_info, FALSE, uid);
+	ret = _media_svc_insert_item_with_data(false, &content_info, false, uid);
 
 	if (ret == MS_MEDIA_ERR_NONE) {
 		media_svc_debug("Insertion is successful. Sending noti for this");
-		_media_svc_publish_noti(MS_MEDIA_ITEM_FILE, MS_MEDIA_ITEM_INSERT, content_info.path, content_info.media_type, content_info.media_uuid, content_info.mime_type);
+		_media_svc_publish_noti(MS_MEDIA_ITEM_INSERT, content_info.path, content_info.media_type, content_info.media_uuid, content_info.mime_type);
 	} else if (ret == MS_MEDIA_ERR_DB_CONSTRAINT_FAIL) {
 		media_svc_error("This item is already inserted. This may be normal operation because other process already did this");
 	}
@@ -385,7 +322,13 @@ int media_svc_insert_item_immediately(sqlite3 *handle, const char *storage_id, m
 	return ret;
 }
 
-int media_svc_move_item(sqlite3 *handle, const char *src_path, const char *dest_path, uid_t uid)
+int media_svc_move_item(sqlite3 *handle,
+								const char *src_path,
+								const char *dest_path,
+								const char *media_id,
+								int media_type,
+								const char *mime_type,
+								uid_t uid)
 {
 	int ret = MS_MEDIA_ERR_NONE;
 	char *file_name = NULL;
@@ -393,21 +336,19 @@ int media_svc_move_item(sqlite3 *handle, const char *src_path, const char *dest_
 	int modified_time = 0;
 	char folder_uuid[MEDIA_SVC_UUID_SIZE + 1] = {0, };
 	char old_thumb_path[MEDIA_SVC_PATHNAME_SIZE] = {0, };
-	char org_stg_id[MEDIA_SVC_UUID_SIZE + 1] = {0, };
 	char dst_stg_id[MEDIA_SVC_UUID_SIZE + 1] = {0, };
 	ms_user_storage_type_e org_stg_type = MS_USER_STORAGE_INTERNAL;
 	ms_user_storage_type_e dst_stg_type = MS_USER_STORAGE_INTERNAL;
-	int media_type = -1;
 
 	media_svc_debug_fenter();
 
 	media_svc_retvm_if(handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
 	media_svc_retvm_if(!STRING_VALID(src_path), MS_MEDIA_ERR_INVALID_PARAMETER, "src_path is NULL");
 	media_svc_retvm_if(!STRING_VALID(dest_path), MS_MEDIA_ERR_INVALID_PARAMETER, "dest_path is NULL");
+	media_svc_retvm_if(!STRING_VALID(media_id), MS_MEDIA_ERR_INVALID_PARAMETER, "media_id is NULL");
+	media_svc_retvm_if(!STRING_VALID(mime_type), MS_MEDIA_ERR_INVALID_PARAMETER, "mime_type is NULL");
 
 	/* Get storage_id */
-	ret = _media_svc_get_storage_uuid(handle, src_path, org_stg_id, uid);
-	media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 	ret = _media_svc_get_storage_uuid(handle, dest_path, dst_stg_id, uid);
 	media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 	/* Get storage_type */
@@ -417,7 +358,7 @@ int media_svc_move_item(sqlite3 *handle, const char *src_path, const char *dest_
 	media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
 	/*check and update folder*/
-	ret = _media_svc_get_and_append_folder_id_by_path(handle, dst_stg_id, dest_path, dst_stg_type, folder_uuid, uid);
+	ret = _media_svc_get_and_append_folder_id_by_path(handle, false, dst_stg_id, dest_path, dst_stg_type, folder_uuid, uid);
 	media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
 	/*get filename*/
@@ -426,290 +367,186 @@ int media_svc_move_item(sqlite3 *handle, const char *src_path, const char *dest_
 	/*get modified_time*/
 	modified_time = _media_svc_get_file_time(dest_path);
 
-	ret = _media_svc_get_media_type_by_path(handle, org_stg_id, src_path, &media_type);
-	if (ret != MS_MEDIA_ERR_NONE) {
-		media_svc_error("_media_svc_get_media_type_by_path failed");
-		SAFE_FREE(file_name);
-		return ret;
-	}
-
 	/*get old thumbnail_path and remove thumbnail */
 	ret = _media_svc_get_thumbnail_path_by_path(handle, src_path, old_thumb_path);
 	if ((ret != MS_MEDIA_ERR_NONE) && (ret != MS_MEDIA_ERR_DB_NO_RECORD)) {
 		media_svc_error("_media_svc_get_thumbnail_path_by_path failed");
-		SAFE_FREE(file_name);
+		g_free(file_name);
 		return ret;
 	}
 
-	if (STRING_VALID(old_thumb_path)) {
-		ret = _media_svc_remove_file(old_thumb_path);
-		if (ret != MS_MEDIA_ERR_NONE)
-			media_svc_error("_media_svc_remove_file failed : %d", ret);
-	}
+	_media_svc_remove_file(old_thumb_path);
 
 	/*move item*/
-	ret = _media_svc_update_item_by_path(org_stg_id, src_path, dst_stg_id, dst_stg_type, dest_path, file_name, modified_time, folder_uuid, uid);
-	SAFE_FREE(file_name);
+	ret = _media_svc_update_item_by_path(src_path, dst_stg_id, dst_stg_type, dest_path, file_name, modified_time, folder_uuid, uid);
+	g_free(file_name);
 	media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
 	media_svc_debug("Move is successful. Sending noti for this");
-
-	/* Get notification info */
-	media_svc_noti_item *noti_item = NULL;
-	ret = _media_svc_get_noti_info(handle, dst_stg_id, dest_path, MS_MEDIA_ITEM_FILE, &noti_item);
-	media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
-
-	/* Send notification for move */
-	_media_svc_publish_noti(MS_MEDIA_ITEM_FILE, MS_MEDIA_ITEM_UPDATE, src_path, media_type, noti_item->media_uuid, noti_item->mime_type);
-	_media_svc_destroy_noti_item(noti_item);
+	_media_svc_publish_noti(MS_MEDIA_ITEM_UPDATE, src_path, media_type, media_id, mime_type);
 
 	/*update folder modified_time*/
 	folder_path = g_path_get_dirname(dest_path);
 	ret = _media_svc_update_folder_modified_time_by_folder_uuid(folder_uuid, folder_path, uid);
-	SAFE_FREE(folder_path);
+	g_free(folder_path);
 	media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
 	return MS_MEDIA_ERR_NONE;
 }
 
-int media_svc_set_item_validity_begin(int data_cnt)
-{
-	media_svc_debug("Transaction data count : [%d]", data_cnt);
-
-	media_svc_retvm_if(data_cnt < 1, MS_MEDIA_ERR_INVALID_PARAMETER, "data_cnt shuld be bigger than 1");
-
-	g_media_svc_item_validity_data_cnt = data_cnt;
-	g_media_svc_item_validity_cur_data_cnt = 0;
-
-	return MS_MEDIA_ERR_NONE;
-}
-
-int media_svc_set_item_validity_end(uid_t uid)
-{
-	int ret = MS_MEDIA_ERR_NONE;
-
-	media_svc_debug_fenter();
-
-	if (g_media_svc_item_validity_cur_data_cnt > 0)
-		ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_SET_ITEM_VALIDITY, uid);
-
-	g_media_svc_item_validity_data_cnt = 1;
-	g_media_svc_item_validity_cur_data_cnt = 0;
-
-	return ret;
-}
-
-int media_svc_set_item_validity(const char *storage_id, const char *path, int validity, uid_t uid)
+int media_svc_set_item_validity(const char *path, int validity, uid_t uid)
 {
 	int ret = MS_MEDIA_ERR_NONE;
 
-	if (g_media_svc_item_validity_data_cnt == 1) {
-
-		return _media_svc_update_item_validity(storage_id, path, validity, FALSE, uid);
-
-	} else if (g_media_svc_item_validity_cur_data_cnt < (g_media_svc_item_validity_data_cnt - 1)) {
-
-		ret = _media_svc_update_item_validity(storage_id, path, validity, TRUE, uid);
-		media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
-
-		g_media_svc_item_validity_cur_data_cnt++;
-
-	} else if (g_media_svc_item_validity_cur_data_cnt == (g_media_svc_item_validity_data_cnt - 1)) {
-
-		ret = _media_svc_update_item_validity(storage_id, path, validity, TRUE, uid);
-		media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
+	ret = _media_svc_update_item_validity(path, validity, true, uid);
+	media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
-		ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_SET_ITEM_VALIDITY, uid);
+	/* To avoid over-occupying memory, update per BATCH_ITEM_COUNT_MAX. */
+	if (++g_media_svc_cur_data_cnt == BATCH_ITEM_COUNT_MAX) {
+		ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_SCANNER, uid);
 		media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
-		g_media_svc_item_validity_cur_data_cnt = 0;
-
-	} else {
-
-		media_svc_error("Error in media_svc_set_item_validity");
-		return MS_MEDIA_ERR_INTERNAL;
+		g_media_svc_cur_data_cnt = 0;
 	}
 
-	return MS_MEDIA_ERR_NONE;
+	return ret;
 }
 
 int media_svc_delete_item_by_path(sqlite3 *handle, const char *storage_id, const char *path, uid_t uid)
 {
 	int ret = MS_MEDIA_ERR_NONE;
 	char thumb_path[MEDIA_SVC_PATHNAME_SIZE] = {0, };
+	media_svc_noti_item *noti_item = NULL;
 
 	media_svc_debug_fenter();
 
-	int media_type = -1;
-	ret = _media_svc_get_media_type_by_path(handle, storage_id, path, &media_type);
-	media_svc_retv_if((ret != MS_MEDIA_ERR_NONE), ret);
-
 	/*Get thumbnail path to delete*/
 	ret = _media_svc_get_thumbnail_path_by_path(handle, path, thumb_path);
 	media_svc_retv_if((ret != MS_MEDIA_ERR_NONE) && (ret != MS_MEDIA_ERR_DB_NO_RECORD), ret);
 
-	if (g_media_svc_insert_item_data_cnt == 1) {
-
-		/* Get notification info */
-		media_svc_noti_item *noti_item = NULL;
-		ret = _media_svc_get_noti_info(handle, storage_id, path, MS_MEDIA_ITEM_FILE, &noti_item);
-		media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
-
-		/*Delete item*/
-		ret = _media_svc_delete_item_by_path(storage_id, path, FALSE, uid);
-		if (ret != MS_MEDIA_ERR_NONE) {
-			media_svc_error("_media_svc_delete_item_by_path failed : %d", ret);
-			_media_svc_destroy_noti_item(noti_item);
-
-			return ret;
-		}
+	/* Get notification info */
+	ret = _media_svc_get_noti_info(handle, path, &noti_item);
+	media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
-		/* Send notification */
-		media_svc_debug("Deletion is successful. Sending noti for this");
-		_media_svc_publish_noti(MS_MEDIA_ITEM_FILE, MS_MEDIA_ITEM_DELETE, path, media_type, noti_item->media_uuid, noti_item->mime_type);
+	/*Delete item*/
+	ret = _media_svc_delete_item_by_path(path, uid);
+	if (ret != MS_MEDIA_ERR_NONE) {
+		media_svc_error("_media_svc_delete_item_by_path failed : %d", ret);
 		_media_svc_destroy_noti_item(noti_item);
-	} else {
-		ret = _media_svc_delete_item_by_path(storage_id, path, TRUE, uid);
-		if (ret != MS_MEDIA_ERR_NONE) {
-			media_svc_error("_media_svc_delete_item_by_path failed : %d", ret);
-			return ret;
-		}
 
+		return ret;
 	}
 
+	/* Send notification */
+	media_svc_debug("Deletion is successful. Sending noti for this");
+	_media_svc_publish_noti(MS_MEDIA_ITEM_DELETE, path, noti_item->media_type, noti_item->media_uuid, noti_item->mime_type);
+	_media_svc_destroy_noti_item(noti_item);
+
 	/*Delete thumbnail*/
-	if (STRING_VALID(thumb_path)) {
-		ret = _media_svc_remove_file(thumb_path);
-		if (ret != MS_MEDIA_ERR_NONE)
-			media_svc_error("fail to remove thumbnail file.");
-	}
+	_media_svc_remove_file(thumb_path);
 
 	return MS_MEDIA_ERR_NONE;
 }
 
-int media_svc_refresh_item(sqlite3 *handle, const char *storage_id, ms_user_storage_type_e storage_type, const char *path, uid_t uid)
+int media_svc_refresh_item(sqlite3 *handle, bool is_direct, const char *storage_id, ms_user_storage_type_e storage_type, const char *path, uid_t uid)
 {
 	int ret = MS_MEDIA_ERR_NONE;
-	media_svc_media_type_e media_type;
 	char thumb_path[MEDIA_SVC_PATHNAME_SIZE + 1] = {0, };
+	media_svc_content_info_s content_info = {0, };
+	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");
-	media_svc_retvm_if(_media_svc_check_storage_type(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
-
-	media_svc_content_info_s content_info;
-	memset(&content_info, 0, sizeof(media_svc_content_info_s));
+	media_svc_retvm_if(!_media_svc_is_valid_storage_type(storage_type), MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
 
 	/*Set media info*/
-	ret = _media_svc_set_media_info(&content_info, storage_id, storage_type, path, &media_type, TRUE);
-	if (ret != MS_MEDIA_ERR_NONE)
-		return ret;
+	ret = _media_svc_set_media_info(&content_info, storage_id, storage_type, path, true);
+	media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
 	/* Initialize thumbnail information to remake thumbnail. */
 	ret = _media_svc_get_thumbnail_path_by_path(handle, path, thumb_path);
-	if (ret != MS_MEDIA_ERR_NONE && ret != MS_MEDIA_ERR_DB_NO_RECORD) {
-		_media_svc_destroy_content_info(&content_info);
-		return ret;
-	}
+	if (ret != MS_MEDIA_ERR_NONE && ret != MS_MEDIA_ERR_DB_NO_RECORD)
+		goto REFRESH_FINALIZE;
 
 	if (STRING_VALID(thumb_path)) {
-		if (g_file_test(thumb_path, G_FILE_TEST_EXISTS)) {
-			ret = _media_svc_remove_file(thumb_path);
-			if (ret != MS_MEDIA_ERR_NONE)
-				media_svc_error("_media_svc_remove_file failed : %s", thumb_path);
-		}
+		_media_svc_remove_file(thumb_path);
 
-		ret = _media_svc_update_thumbnail_path(storage_id, path, NULL, uid);
-		if (ret != MS_MEDIA_ERR_NONE) {
-			_media_svc_destroy_content_info(&content_info);
-			return ret;
-		}
+		ret = _media_svc_update_thumbnail_path(path, NULL, uid);
+		if (ret != MS_MEDIA_ERR_NONE)
+			goto REFRESH_FINALIZE;
 	}
 
 	/* Get notification info */
-	media_svc_noti_item *noti_item = NULL;
-	ret = _media_svc_get_noti_info(handle, storage_id, path, MS_MEDIA_ITEM_FILE, &noti_item);
-	if (ret != MS_MEDIA_ERR_NONE) {
-		_media_svc_destroy_content_info(&content_info);
-		return ret;
-	}
+	ret = _media_svc_get_noti_info(handle, path, &noti_item);
+	if (ret != MS_MEDIA_ERR_NONE)
+		goto REFRESH_FINALIZE;
 
-	media_type = noti_item->media_type;
-	content_info.media_type = media_type;
+	content_info.media_type = noti_item->media_type;
+	content_info.mime_type = g_strdup(noti_item->mime_type);
 
-	if (media_type == MEDIA_SVC_MEDIA_TYPE_OTHER
-	|| (media_type == MEDIA_SVC_MEDIA_TYPE_PVR)
-	|| (media_type == MEDIA_SVC_MEDIA_TYPE_UHD)
-	|| (media_type == MEDIA_SVC_MEDIA_TYPE_SCSA))
-		media_svc_debug("Do nothing [%d]", media_type);
-	else if (media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE)
+	switch (content_info.media_type) {
+	case MEDIA_SVC_MEDIA_TYPE_IMAGE:
 		ret = _media_svc_extract_image_metadata(&content_info);
-	else
-		ret = _media_svc_extract_media_metadata(handle, &content_info, uid);
-
-	if (ret != MS_MEDIA_ERR_NONE) {
-		_media_svc_destroy_noti_item(noti_item);
-		_media_svc_destroy_content_info(&content_info);
-		return ret;
+		break;
+	case MEDIA_SVC_MEDIA_TYPE_VIDEO:
+	case MEDIA_SVC_MEDIA_TYPE_SOUND:
+	case MEDIA_SVC_MEDIA_TYPE_MUSIC:
+		ret = _media_svc_extract_media_metadata(handle, is_direct, &content_info, uid);
+		break;
+	default:
+		/* The 'TITLE' should always be filled in */
+		content_info.media_meta.title = _media_svc_get_title_by_path(content_info.path);
+		break;
 	}
 
+	if (ret != MS_MEDIA_ERR_NONE)
+		goto REFRESH_FINALIZE;
+
 	/* Extracting thumbnail */
 	if (content_info.thumbnail_path == NULL) {
-		if (media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE || media_type == MEDIA_SVC_MEDIA_TYPE_VIDEO) {
+		if (content_info.media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE || content_info.media_type == MEDIA_SVC_MEDIA_TYPE_VIDEO) {
 			memset(thumb_path, 0, sizeof(thumb_path));
 
-			ret = _media_svc_create_thumbnail(content_info.path, thumb_path, media_type, uid);
+			ret = _media_svc_create_thumbnail(content_info.path, thumb_path, content_info.media_type, uid);
 			if (ret == MS_MEDIA_ERR_NONE)
 				content_info.thumbnail_path = g_strdup(thumb_path);
 		}
 	}
 
-	ret = _media_svc_update_item_with_data(storage_id, &content_info, uid);
+	ret = _media_svc_update_item_with_data(is_direct, &content_info, uid);
 
 	if (ret == MS_MEDIA_ERR_NONE) {
-		media_svc_debug("Update is successful. Sending noti for this");
-		_media_svc_publish_noti(MS_MEDIA_ITEM_FILE, MS_MEDIA_ITEM_UPDATE, content_info.path, noti_item->media_type, noti_item->media_uuid, noti_item->mime_type);
+		if (is_direct) {
+			/* To avoid over-occupying memory, update per BATCH_ITEM_COUNT_MAX. */
+			if (++g_media_svc_cur_data_cnt == BATCH_ITEM_COUNT_MAX) {
+				ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_SCANNER, uid);
+				if (ret != MS_MEDIA_ERR_NONE)
+					goto REFRESH_FINALIZE;
+
+				g_media_svc_cur_data_cnt = 0;
+			}
+		} else {
+			/* Except scanner case */
+			media_svc_debug("Update is successful. Sending noti for this");
+			_media_svc_publish_noti(MS_MEDIA_ITEM_UPDATE, content_info.path, noti_item->media_type, noti_item->media_uuid, noti_item->mime_type);
+		}
 	} else {
 		media_svc_error("_media_svc_update_item_with_data failed : %d", ret);
 	}
 
+REFRESH_FINALIZE:
 	_media_svc_destroy_content_info(&content_info);
 	_media_svc_destroy_noti_item(noti_item);
 
 	return ret;
 }
 
-int media_svc_send_dir_update_noti(sqlite3 *handle, const char *storage_id, const char *dir_path, const char *folder_id, media_item_update_type_e update_type, int pid)
+int media_svc_send_dir_update_noti(const char *dir_path, const char *folder_id, media_item_update_type_e update_type, int pid)
 {
-	int ret = MS_MEDIA_ERR_NONE;
-	char *uuid = NULL;
-
-	media_svc_retvm_if(handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
 	media_svc_retvm_if(!STRING_VALID(dir_path), MS_MEDIA_ERR_INVALID_PARAMETER, "dir_path is NULL");
 
-	/* Get notification info */
-	media_svc_noti_item *noti_item = NULL;
-	ret = _media_svc_get_noti_info(handle, storage_id, dir_path, MS_MEDIA_ITEM_DIRECTORY, &noti_item);
-	media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
-
-	if (folder_id != NULL) {
-		uuid = strndup(folder_id, strlen(folder_id));
-	} else {
-		if (noti_item->media_uuid != NULL) {
-			uuid = strndup(noti_item->media_uuid, strlen(noti_item->media_uuid));
-		} else {
-			_media_svc_destroy_noti_item(noti_item);
-			media_svc_error("folder uuid is wrong");
-			return MS_MEDIA_ERR_DB_INTERNAL;
-		}
-	}
-
-	ret = _media_svc_publish_dir_noti_v2(MS_MEDIA_ITEM_DIRECTORY, update_type, dir_path, -1, uuid, NULL, pid);
-	_media_svc_destroy_noti_item(noti_item);
-	SAFE_FREE(uuid);
-
-	return ret;
+	return _media_svc_publish_dir_noti(update_type, dir_path, folder_id, pid);
 }
 
 int media_svc_check_db_upgrade(sqlite3 *handle, int user_version, uid_t uid)
@@ -719,93 +556,85 @@ int media_svc_check_db_upgrade(sqlite3 *handle, int user_version, uid_t uid)
 	return _media_svc_check_db_upgrade(handle, user_version, uid);
 }
 
-int media_svc_update_item_begin(int data_cnt)
+static void __media_svc_noti_all_storage(sqlite3 *handle, uid_t uid)
 {
-	media_svc_debug("Transaction data count : [%d]", data_cnt);
-
-	media_svc_retvm_if(data_cnt < 1, MS_MEDIA_ERR_INVALID_PARAMETER, "data_cnt shuld be bigger than 1");
+	int ret = MS_MEDIA_ERR_NONE;
+	char *root_path = NULL;
+	GPtrArray *path_list = NULL;
+	int i = 0;
 
-	g_media_svc_update_item_data_cnt = data_cnt;
-	g_media_svc_update_item_cur_data_cnt = 0;
+	ret = ms_user_get_internal_root_path(uid, &root_path);
+	media_svc_retm_if(ret != MS_MEDIA_ERR_NONE, "Fail to get root path");
 
-	return MS_MEDIA_ERR_NONE;
-}
+	ret = _media_svc_publish_dir_noti(MS_MEDIA_ITEM_UPDATE, root_path, NULL, 0);
+	if (ret != MS_MEDIA_ERR_NONE)
+		media_svc_error("Fail to send noti");
 
-int media_svc_update_item_end(uid_t uid)
-{
-	int ret = MS_MEDIA_ERR_NONE;
+	g_free(root_path);
 
-	media_svc_debug_fenter();
+	path_list = g_ptr_array_new_with_free_func(g_free);
+	_media_svc_get_storage_path(handle, &path_list);
 
-	if (g_media_svc_update_item_cur_data_cnt > 0)
-		ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_UPDATE_ITEM, uid);
+	for (i = 0; i < path_list->len; i++) {
+		root_path = g_ptr_array_index(path_list, i);
 
-	g_media_svc_update_item_data_cnt = 1;
-	g_media_svc_update_item_cur_data_cnt = 0;
+		ret = _media_svc_publish_dir_noti(MS_MEDIA_ITEM_UPDATE, root_path, NULL, 0);
+		if (ret != MS_MEDIA_ERR_NONE)
+			media_svc_error("Fail to send noti");
+	}
 
-	return ret;
+	g_ptr_array_free(path_list, TRUE);
 }
 
-int media_svc_update_item_meta(const char *file_path, const char *storage_id, int storage_type, uid_t uid)
+int media_svc_update_item_meta(sqlite3 *handle, uid_t uid)
 {
 	int ret = MS_MEDIA_ERR_NONE;
-	media_svc_media_type_e media_type;
+	int i = 0;
+	char *sql = NULL;
+	char *file_path = NULL;
 	media_svc_content_info_s content_info;
-	memset(&content_info, 0, sizeof(media_svc_content_info_s));
-
-	/*Set media info*/
-	ret = _media_svc_set_media_info(&content_info, storage_id, storage_type, file_path, &media_type, FALSE);
-	if (ret != MS_MEDIA_ERR_NONE)
-		return ret;
-
-	if (media_type == MEDIA_SVC_MEDIA_TYPE_MUSIC)
-		ret = _media_svc_extract_music_metadata_for_update(&content_info, media_type);
-	else {
-		_media_svc_destroy_content_info(&content_info);
-		return MS_MEDIA_ERR_NONE;
-	}
+	GPtrArray *path_list = g_ptr_array_new_with_free_func(g_free);
 
+	sql = sqlite3_mprintf("SELECT media_path FROM %q WHERE media_type=3 AND validity=1", DB_TABLE_MEDIA);
+	ret = _media_svc_get_media(handle, sql, &path_list);
 	if (ret != MS_MEDIA_ERR_NONE) {
-		_media_svc_destroy_content_info(&content_info);
+		media_svc_error("Fail to get media list");
+		g_ptr_array_free(path_list, TRUE);
 		return ret;
 	}
 
-	if (g_media_svc_update_item_data_cnt == 1) {
-
-		ret = _media_svc_update_meta_with_data(&content_info);
-		media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
+	for (i = 0; i < path_list->len; i++) {
+		file_path = g_ptr_array_index(path_list, i);
 
-	} else if (g_media_svc_update_item_cur_data_cnt < (g_media_svc_update_item_data_cnt - 1)) {
-
-		ret = _media_svc_update_meta_with_data(&content_info);
-		media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
-
-		g_media_svc_update_item_cur_data_cnt++;
-
-	} else if (g_media_svc_update_item_cur_data_cnt == (g_media_svc_update_item_data_cnt - 1)) {
+		memset(&content_info, 0, sizeof(media_svc_content_info_s));
+		ret = _media_svc_extract_music_metadata_for_update(&content_info, file_path);
+		if (ret != MS_MEDIA_ERR_NONE) {
+			media_svc_error("Fail to extract metadata");
+			_media_svc_destroy_content_info(&content_info);
+			continue;
+		}
 
 		ret = _media_svc_update_meta_with_data(&content_info);
-		media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
-
-		ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_UPDATE_ITEM, uid);
-		media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info);
-
-		g_media_svc_update_item_cur_data_cnt = 0;
+		if (ret != MS_MEDIA_ERR_NONE)
+			media_svc_error("Fail to append item[%s]", content_info.path);
 
-	} else {
-		media_svc_error("Error in media_svc_update_item_meta");
 		_media_svc_destroy_content_info(&content_info);
-		return MS_MEDIA_ERR_INTERNAL;
 	}
 
-	_media_svc_destroy_content_info(&content_info);
+	g_ptr_array_free(path_list, TRUE);
+
+	ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_SCANNER, uid);
+	media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "_media_svc_list_query_do failed");
+
+	/* Noti for this */
+	__media_svc_noti_all_storage(handle, uid);
 
 	return ret;
 }
 
-int media_svc_publish_noti(media_item_type_e update_item, media_item_update_type_e update_type, const char *path, media_type_e media_type, const char *uuid, const char *mime_type)
+int media_svc_publish_noti(media_item_update_type_e update_type, const char *path, media_type_e media_type, const char *uuid, const char *mime_type)
 {
-	return _media_svc_publish_noti(update_item, update_type, path, media_type, uuid, mime_type);
+	return _media_svc_publish_noti(update_type, path, media_type, uuid, mime_type);
 }
 
 int media_svc_get_pinyin(const char *src_str, char **pinyin_str)
@@ -829,9 +658,6 @@ int media_svc_set_storage_validity(sqlite3 *handle, const char *storage_id, int
 	ret = _media_svc_update_storage_validity(storage_id, validity, uid);
 	media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "update storage validity failed: %d", ret);
 
-	ret = _media_svc_update_media_view(handle, uid);
-	media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "update media view failed : %d", ret);
-
 	return ret;
 }
 
@@ -840,20 +666,9 @@ int media_svc_get_storage_id(sqlite3 *handle, const char *path, char *storage_id
 	return _media_svc_get_storage_uuid(handle, path, storage_id, uid);
 }
 
-int media_svc_generate_uuid(char **uuid)
+int media_svc_check_storage(sqlite3 *handle, const char *storage_id, char **storage_path, int *validity)
 {
-	char *gen_uuid = NULL;
-	gen_uuid = _media_info_generate_uuid();
-	media_svc_retvm_if(gen_uuid == NULL, MS_MEDIA_ERR_INTERNAL, "Fail to generate uuid");
-
-	*uuid = strdup(gen_uuid);
-
-	return MS_MEDIA_ERR_NONE;
-}
-
-int media_svc_check_storage(sqlite3 *handle, const char *storage_id, char **storage_path, int *validity, uid_t uid)
-{
-	return _media_svc_check_storage(handle, storage_id, storage_path, validity, uid);
+	return _media_svc_check_storage(handle, storage_id, storage_path, validity);
 }
 
 int media_svc_update_storage(sqlite3 *handle, const char *storage_id, const char *storage_path, uid_t uid)
@@ -868,17 +683,11 @@ int media_svc_insert_storage(sqlite3 *handle, const char *storage_id, const char
 	media_svc_retvm_if(handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
 	media_svc_retvm_if(storage_id == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
 	media_svc_retvm_if(storage_path == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "storage_path is NULL");
-	media_svc_retvm_if(_media_svc_check_storage_type(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
+	media_svc_retvm_if(!_media_svc_is_valid_storage_type(storage_type), MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
 
 	ret = _media_svc_append_storage(storage_id, storage_path, storage_type, uid);
 	media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "append storage failed : %d", ret);
 
-	ret = _media_svc_create_media_table_with_id(storage_id, uid);
-	media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "create media table failed : %d", ret);
-
-	ret = _media_svc_update_media_view(handle, uid);
-	media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "update media view failed : %d", ret);
-
 	/* Remove external storage that validity is 0 */
 	ret = _media_svc_delete_invalid_storage(handle, uid);
 	media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "Delete invalid storage failed : %d", ret);
@@ -886,94 +695,24 @@ int media_svc_insert_storage(sqlite3 *handle, const char *storage_id, const char
 	return ret;
 }
 
-int media_svc_insert_folder_begin(int data_cnt)
-{
-	media_svc_debug("Transaction data count : [%d]", data_cnt);
-
-	media_svc_retvm_if(data_cnt < 1, MS_MEDIA_ERR_INVALID_PARAMETER, "data_cnt shuld be bigger than 1");
-
-	g_media_svc_insert_folder_data_cnt = data_cnt;
-	g_media_svc_insert_folder_cur_data_cnt = 0;
-
-	return MS_MEDIA_ERR_NONE;
-}
-
-int media_svc_insert_folder_end(uid_t uid)
-{
-	int ret = MS_MEDIA_ERR_NONE;
-
-	media_svc_debug_fenter();
-
-	if (g_media_svc_insert_folder_cur_data_cnt > 0)
-		ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_INSERT_FOLDER, uid);
-
-	g_media_svc_insert_folder_data_cnt = 1;
-	g_media_svc_insert_folder_cur_data_cnt = 0;
-
-	return ret;
-}
-
 int media_svc_insert_folder(sqlite3 *handle, const char *storage_id, ms_user_storage_type_e storage_type, const char *path, uid_t uid)
 {
-	int ret = MS_MEDIA_ERR_NONE;
-	char folder_uuid[MEDIA_SVC_UUID_SIZE+1] = {0,};
-
 	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");
-	media_svc_retvm_if(_media_svc_check_storage_type(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
-
-	if (g_media_svc_insert_folder_data_cnt == 1) {
-
-		ret = _media_svc_get_and_append_folder_id_by_folder_path(handle, storage_id, path, storage_type, folder_uuid, FALSE, uid);
-
-	} else if (g_media_svc_insert_folder_cur_data_cnt < (g_media_svc_insert_folder_data_cnt - 1)) {
-
-		ret = _media_svc_get_and_append_folder_id_by_folder_path(handle, storage_id, path, storage_type, folder_uuid, TRUE, uid);
-		media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
-
-		g_media_svc_insert_folder_cur_data_cnt++;
-
-	} else if (g_media_svc_insert_folder_cur_data_cnt == (g_media_svc_insert_folder_data_cnt - 1)) {
-
-		ret = _media_svc_get_and_append_folder_id_by_folder_path(handle, storage_id, path, storage_type, folder_uuid, TRUE, uid);
-		media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
+	media_svc_retvm_if(!_media_svc_is_valid_storage_type(storage_type), MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
 
-		ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_INSERT_FOLDER, uid);
-		media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
-
-		g_media_svc_insert_folder_cur_data_cnt = 0;
-
-	} else {
-		media_svc_error("Error in media_svc_set_insert_folder");
-		return MS_MEDIA_ERR_INTERNAL;
-	}
-
-	return ret;
+	return _media_svc_get_and_append_folder_id_by_folder_path(handle, storage_id, path, storage_type, uid);
 }
 
-int media_svc_set_folder_validity(sqlite3 *handle, const char *storage_id, const char *start_path, int validity, bool is_recursive, uid_t uid)
+int media_svc_set_folder_validity(const char *storage_id, const char *start_path, int validity, bool is_recursive, uid_t uid)
 {
-	return _media_svc_set_folder_validity(handle, storage_id, start_path, validity, is_recursive, uid);
+	return _media_svc_set_folder_validity(true, storage_id, start_path, validity, is_recursive, uid);
 }
 
 int media_svc_check_folder_exist_by_path(sqlite3 *handle, const char *storage_id, const char *folder_path)
 {
-	int ret = MS_MEDIA_ERR_NONE;
-	int count = -1;
-
-	ret = _media_svc_count_folder_with_path(handle, storage_id, folder_path, &count);
-	media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
-
-	if (count > 0) {
-		media_svc_debug("item is exist in database");
-		return MS_MEDIA_ERR_NONE;
-	} else {
-		media_svc_debug("item is not exist in database");
-		return MS_MEDIA_ERR_DB_NO_RECORD;
-	}
-
-	return MS_MEDIA_ERR_NONE;
+	return _media_svc_check_folder_by_path(handle, storage_id, folder_path);
 }
 
 int media_svc_append_query(const char *query, uid_t uid)
@@ -991,7 +730,7 @@ int media_svc_get_media_type(const char *path, int *mediatype)
 	return _media_svc_get_media_type(path, mediatype);
 }
 
-int media_svc_create_thumbnail(const char *storage_id, const char *file_path, int media_type, uid_t uid, char **thumbnail_path)
+int media_svc_create_thumbnail(const char *file_path, int media_type, uid_t uid, char **thumbnail_path)
 {
 	int ret = MS_MEDIA_ERR_NONE;
 	char thumb_path[MEDIA_SVC_PATHNAME_SIZE + 1] = { 0, };
@@ -1010,7 +749,7 @@ int media_svc_create_thumbnail(const char *storage_id, const char *file_path, in
 	}
 
 	// 3. Update creation result to media db
-	sql = sqlite3_mprintf("UPDATE '%q' SET media_thumbnail_path='%q' WHERE path='%q';", storage_id, thumb_path, file_path);
+	sql = sqlite3_mprintf("UPDATE %q SET media_thumbnail_path='%q' WHERE media_path='%q';", DB_TABLE_MEDIA, thumb_path, file_path);
 
 	ret = _media_svc_sql_query(sql, uid);
 	SQLITE3_SAFE_FREE(sql);