X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcommon%2Fmedia-svc.c;h=e45fcfce0f6d01c979b7f87b2d0bc799755a8b1b;hb=64096481e0d31136dcadd033157696c617b78541;hp=7044f926c84a491a5ef1a8278cd98a79ac6584fb;hpb=65f8fa5b308b180921e2f92c74a6d70b0d4bc664;p=platform%2Fcore%2Fmultimedia%2Flibmedia-service.git

diff --git a/src/common/media-svc.c b/src/common/media-svc.c
index 7044f92..e45fcfc 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,16 +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_data_cnt = 0;
+static __thread int g_media_svc_cur_data_cnt = 0;
 
 /* Flag for items to be published by notification */
 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)
 {
@@ -55,83 +49,83 @@ 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;
@@ -139,16 +133,11 @@ int media_svc_create_table(uid_t uid)
 
 	sql = sqlite3_mprintf("pragma user_version = %d;", LATEST_DB_VERSION);
 	ret = _media_svc_sql_query(sql, uid);
+	SQLITE3_SAFE_FREE(sql);
 	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();
 
@@ -159,21 +148,7 @@ 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, 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)
@@ -181,19 +156,14 @@ int media_svc_get_modified_time(sqlite3 *handle, const char *storage_id, const c
 	return _media_svc_get_modified_time(handle, path, modified_time);
 }
 
-int media_svc_insert_item_begin(int data_cnt, bool with_noti, int from_pid)
+int media_svc_insert_item_begin(bool with_noti, int from_pid)
 {
-	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;
 	}
@@ -207,20 +177,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);
+			_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;
 }
@@ -254,7 +221,8 @@ int media_svc_insert_item_bulk(sqlite3 *handle, const char *storage_id, ms_user_
 		ret = _media_svc_extract_media_metadata(handle, true, &content_info, uid);
 		break;
 	default:
-		media_svc_debug("Do nothing[%d]", content_info.media_type);
+		/* The 'TITLE' should always be filled in */
+		content_info.media_meta.title = _media_svc_get_title_by_path(content_info.path);
 		break;
 	}
 
@@ -267,50 +235,21 @@ int media_svc_insert_item_bulk(sqlite3 *handle, const char *storage_id, ms_user_
 	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(true, &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(true, &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(true, &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);
+			_media_svc_publish_noti_list();
 
-			/* 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);
-		}
-
-		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);
@@ -346,7 +285,8 @@ int media_svc_insert_item_immediately(sqlite3 *handle, const char *storage_id, m
 		ret = _media_svc_extract_media_metadata(handle, false, &content_info, uid);
 		break;
 	default:
-		media_svc_debug("Do nothing[%d]", content_info.media_type);
+		/* The 'TITLE' should always be filled in */
+		content_info.media_meta.title = _media_svc_get_title_by_path(content_info.path);
 		break;
 	}
 
@@ -384,12 +324,12 @@ int media_svc_insert_item_immediately(sqlite3 *handle, const char *storage_id, m
 }
 
 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)
+						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;
@@ -432,7 +372,7 @@ int media_svc_move_item(sqlite3 *handle,
 	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;
 	}
 
@@ -440,7 +380,7 @@ int media_svc_move_item(sqlite3 *handle,
 
 	/*move item*/
 	ret = _media_svc_update_item_by_path(src_path, dst_stg_id, dst_stg_type, dest_path, file_name, modified_time, folder_uuid, uid);
-	SAFE_FREE(file_name);
+	g_free(file_name);
 	media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
 	media_svc_debug("Move is successful. Sending noti for this");
@@ -449,71 +389,28 @@ int media_svc_move_item(sqlite3 *handle,
 	/*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 *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(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(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(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)
@@ -556,44 +453,35 @@ int media_svc_refresh_item(sqlite3 *handle, bool is_direct, const char *storage_
 {
 	int ret = MS_MEDIA_ERR_NONE;
 	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_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, true);
-	if (ret != MS_MEDIA_ERR_NONE)
-		return ret;
+	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)) {
 		_media_svc_remove_file(thumb_path);
 
 		ret = _media_svc_update_thumbnail_path(path, NULL, uid);
-		if (ret != MS_MEDIA_ERR_NONE) {
-			_media_svc_destroy_content_info(&content_info);
-			return ret;
-		}
+		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, path, &noti_item);
-	if (ret != MS_MEDIA_ERR_NONE) {
-		_media_svc_destroy_content_info(&content_info);
-		return ret;
-	}
+	if (ret != MS_MEDIA_ERR_NONE)
+		goto REFRESH_FINALIZE;
 
 	content_info.media_type = noti_item->media_type;
 	content_info.mime_type = g_strdup(noti_item->mime_type);
@@ -608,15 +496,13 @@ int media_svc_refresh_item(sqlite3 *handle, bool is_direct, const char *storage_
 		ret = _media_svc_extract_media_metadata(handle, is_direct, &content_info, uid);
 		break;
 	default:
-		media_svc_debug("Do nothing[%d]", content_info.media_type);
+		/* 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) {
-		_media_svc_destroy_noti_item(noti_item);
-		_media_svc_destroy_content_info(&content_info);
-		return ret;
-	}
+	if (ret != MS_MEDIA_ERR_NONE)
+		goto REFRESH_FINALIZE;
 
 	/* Extracting thumbnail */
 	if (content_info.thumbnail_path == NULL) {
@@ -632,12 +518,25 @@ int media_svc_refresh_item(sqlite3 *handle, bool is_direct, const char *storage_
 	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_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);
 
@@ -672,7 +571,7 @@ static void __media_svc_noti_all_storage(sqlite3 *handle, uid_t uid)
 	if (ret != MS_MEDIA_ERR_NONE)
 		media_svc_error("Fail to send noti");
 
-	SAFE_FREE(root_path);
+	g_free(root_path);
 
 	path_list = g_ptr_array_new_with_free_func(g_free);
 	_media_svc_get_storage_path(handle, &path_list);
@@ -688,49 +587,41 @@ static void __media_svc_noti_all_storage(sqlite3 *handle, uid_t uid)
 	g_ptr_array_free(path_list, TRUE);
 }
 
+static void __media_svc_foreach_update_media(gpointer data, gpointer user_data)
+{
+	media_svc_content_info_s content_info = {0, };
+
+	if (_media_svc_extract_music_metadata_for_update(&content_info, (const char *)data) != MS_MEDIA_ERR_NONE) {
+		media_svc_error("Fail to extract metadata");
+		_media_svc_destroy_content_info(&content_info);
+		return;
+	}
+
+	if (_media_svc_update_meta_with_data(&content_info) != MS_MEDIA_ERR_NONE)
+		media_svc_error("Fail to append item[%s]", content_info.path);
+
+	_media_svc_destroy_content_info(&content_info);
+}
+
 int media_svc_update_item_meta(sqlite3 *handle, uid_t uid)
 {
 	int ret = MS_MEDIA_ERR_NONE;
-	int i = 0;
 	char *sql = NULL;
-	char *file_path = NULL;
-	media_svc_content_info_s content_info;
-	GPtrArray *path_list = NULL;
-
-	path_list = g_ptr_array_new_with_free_func(g_free);
-	media_svc_retvm_if(!path_list, MS_MEDIA_ERR_OUT_OF_MEMORY, "Allocation failed");
+	GList *path_list = NULL;
 
-	sql = sqlite3_mprintf("SELECT media_path FROM %q WHERE media_type=3 AND validity=1", MEDIA_SVC_DB_TABLE_MEDIA);
+	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_error("Fail to get media list");
-		g_ptr_array_free(path_list, TRUE);
-		return ret;
-	}
-
-	for (i = 0; i < path_list->len; i++) {
-		file_path = g_ptr_array_index(path_list, i);
-
-		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;
-		}
+	SQLITE3_SAFE_FREE(sql);
+	media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "Fail to get media list");
 
-		ret = _media_svc_update_meta_with_data(&content_info);
-		if (ret != MS_MEDIA_ERR_NONE)
-			media_svc_error("Fail to append item[%s]", content_info.path);
+	if (path_list) {
+		g_list_foreach(path_list, __media_svc_foreach_update_media, NULL);
+		g_list_free_full(path_list, g_free);
 
-		_media_svc_destroy_content_info(&content_info);
+		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");
 	}
 
-	g_ptr_array_free(path_list, TRUE);
-
-	ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_UPDATE_ITEM, 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);
 
@@ -771,17 +662,6 @@ 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)
-{
-	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)
 {
 	return _media_svc_check_storage(handle, storage_id, storage_path, validity);
@@ -821,28 +701,14 @@ int media_svc_insert_folder(sqlite3 *handle, const char *storage_id, ms_user_sto
 	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, true, 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)
@@ -879,7 +745,7 @@ int media_svc_create_thumbnail(const char *file_path, int media_type, uid_t uid,
 	}
 
 	// 3. Update creation result to media db
-	sql = sqlite3_mprintf("UPDATE %q SET media_thumbnail_path='%q' WHERE media_path='%q';", MEDIA_SVC_DB_TABLE_MEDIA, 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);