X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcommon%2Fmedia-svc-media.c;h=66318dfbfb71cdaefa2160c884ea98b9452d611a;hb=1be77a62a87c7533d86c5400b5b965d1b562d3df;hp=2c64f207bde4fd0e8fa34f97169286a7a1dc5e00;hpb=9f74c2e79c2cbad5e115e5d46613372f838d637c;p=platform%2Fcore%2Fmultimedia%2Flibmedia-service.git

diff --git a/src/common/media-svc-media.c b/src/common/media-svc-media.c
index 2c64f20..66318df 100755
--- a/src/common/media-svc-media.c
+++ b/src/common/media-svc-media.c
@@ -20,7 +20,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <media-util-err.h>
 #include "media-svc-media.h"
 #include "media-svc-media-folder.h"
 #include "media-svc-debug.h"
@@ -39,7 +38,7 @@ int _media_svc_check_data_by_path(sqlite3 *handle, const char *path)
 	sqlite3_stmt *sql_stmt = NULL;
 	char *sql = NULL;
 
-	media_svc_retvm_if(!MS_STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "Path is NULL");
+	media_svc_retvm_if(!STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "Path is NULL");
 
 	sql = sqlite3_mprintf("SELECT 1 FROM %q WHERE media_path=%Q", DB_TABLE_MEDIA, path);
 	ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt);
@@ -55,7 +54,7 @@ int _media_svc_get_modified_time(sqlite3 *handle, const char *path, int *modifie
 	sqlite3_stmt *sql_stmt = NULL;
 	char *sql = NULL;
 
-	media_svc_retvm_if(!MS_STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "Path is NULL");
+	media_svc_retvm_if(!STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "Path is NULL");
 
 	sql = sqlite3_mprintf("SELECT media_modified_time FROM %q WHERE media_path=%Q", DB_TABLE_MEDIA, path);
 	ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt);
@@ -68,75 +67,57 @@ int _media_svc_get_modified_time(sqlite3 *handle, const char *path, int *modifie
 	return MS_MEDIA_ERR_NONE;
 }
 
-int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *content_info, bool stack_query, uid_t uid)
+static char *__media_svc_make_insert_query(media_svc_content_info_s *content_info)
 {
-	int ret = MS_MEDIA_ERR_NONE;
+	return sqlite3_mprintf("INSERT INTO %q(media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_modified_time, folder_id, media_thumbnail_path, media_title, album_id, media_album, media_artist, media_album_artist, media_genre, media_year, media_recorded_date, media_copyright, media_track_num, media_width, media_height, media_datetaken, media_orientation, storage_uuid) VALUES (%Q, %Q, %Q, %d, %Q, %lld, %d, %lld, %Q, %Q, %d, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %d, %d, %Q, %d, %Q);",
+			DB_TABLE_MEDIA,
+			content_info->media_uuid,
+			content_info->path,
+			content_info->file_name,
+			content_info->media_type,
+			content_info->mime_type,
+			content_info->size,
+			content_info->modified_time,
+			content_info->folder_id,
+			content_info->thumbnail_path,
+			content_info->media_meta.title,
+			content_info->album_id,
+			content_info->media_meta.album,
+			content_info->media_meta.artist,
+			content_info->media_meta.album_artist,
+			content_info->media_meta.genre,
+			content_info->media_meta.year,
+			content_info->media_meta.recorded_date,
+			content_info->media_meta.copyright,
+			content_info->media_meta.track_num,
+			content_info->media_meta.width,
+			content_info->media_meta.height,
+			content_info->media_meta.datetaken,
+			content_info->media_meta.orientation,
+			content_info->storage_uuid);
+}
 
-	const char *db_fields = "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, folder_id, media_thumbnail_path, media_title, album_id, media_album, media_artist, media_album_artist, media_genre, media_year, media_recorded_date, media_copyright, media_track_num, media_width, media_height, media_datetaken, media_orientation, storage_uuid";
+int _media_svc_insert_item_stack(media_svc_content_info_s *content_info)
+{
+	char *sql = __media_svc_make_insert_query(content_info);
+	media_svc_retvm_if(!sql, MS_MEDIA_ERR_INVALID_PARAMETER, "make query failed");
 
-	const char *db_fields_basic = "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, folder_id, album_id, storage_uuid";
+	media_svc_sec_debug("Query[%s]", sql);
 
-	char *sql = sqlite3_mprintf("INSERT INTO %q(%q) VALUES (%Q, %Q, %Q, %d, %Q, %lld, %d, %d, %lld, %Q, %Q, %d, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %d, %d, %Q, %d, %Q);",
-				DB_TABLE_MEDIA, db_fields,
-				content_info->media_uuid,
-				content_info->path,
-				content_info->file_name,
-				content_info->media_type,
-				content_info->mime_type,
-				content_info->size,
-				content_info->added_time,
-				content_info->modified_time,
-				content_info->folder_id,
-				content_info->thumbnail_path,
-				content_info->media_meta.title,
-				content_info->album_id,
-				content_info->media_meta.album,
-				content_info->media_meta.artist,
-				content_info->media_meta.album_artist,
-				content_info->media_meta.genre,
-				content_info->media_meta.year,
-				content_info->media_meta.recorded_date,
-				content_info->media_meta.copyright,
-				content_info->media_meta.track_num,
-				content_info->media_meta.width,
-				content_info->media_meta.height,
-				content_info->media_meta.datetaken,
-				content_info->media_meta.orientation,
-				content_info->storage_uuid);
+	_media_svc_sql_query_add(&g_media_svc_scanner_query_list, &sql);
 
-	/* Check query length */
-	if (sql != NULL && strlen(sql) >= (MEDIA_SVC_QUERY_LEN_MAX - 1) && is_direct == false) {
-		media_svc_debug("Query length is over %d byte.. So, remake query using only basic information..", MEDIA_SVC_QUERY_LEN_MAX - 1);
-		SQLITE3_SAFE_FREE(sql);
-
-		sql = sqlite3_mprintf("INSERT INTO %q(%q) VALUES (%Q, %Q, %Q, %d, %Q, %lld, %d, %d, %lld, %d, %Q);",
-						DB_TABLE_MEDIA, db_fields_basic,
-						content_info->media_uuid,
-						content_info->path,
-						content_info->file_name,
-						content_info->media_type,
-						content_info->mime_type,
-						content_info->size,
-						content_info->added_time,
-						content_info->modified_time,
-						content_info->folder_id,
-						content_info->album_id,
-						content_info->storage_uuid
-						);
-	}
+	return MS_MEDIA_ERR_NONE;
+}
 
-	if (!stack_query) {
-		if (is_direct)
-			ret = _media_svc_sql_query_direct(sql, uid);
-		else
-			ret = _media_svc_sql_query(sql, uid);
+int _media_svc_insert_item(media_svc_content_info_s *content_info, uid_t uid)
+{
+	int ret = MS_MEDIA_ERR_NONE;
+	char *sql = __media_svc_make_insert_query(content_info);
+	media_svc_retvm_if(!sql, MS_MEDIA_ERR_INVALID_PARAMETER, "make query failed");
 
-		SQLITE3_SAFE_FREE(sql);
-		media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "failed to insert item");
-	} else {
-		media_svc_sec_debug("Query[%s]", sql);
-		_media_svc_sql_query_add(&g_media_svc_scanner_query_list, &sql);
-	}
+	ret = _media_svc_sql_query(sql, uid);
+	SQLITE3_SAFE_FREE(sql);
+	media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "failed to insert item");
 
 	return MS_MEDIA_ERR_NONE;
 }
@@ -184,7 +165,7 @@ int _media_svc_get_thumbnail_path_by_path(sqlite3 *handle, const char *path, cha
 	sqlite3_stmt *sql_stmt = NULL;
 	char *sql = NULL;
 
-	media_svc_retvm_if(!MS_STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
+	media_svc_retvm_if(!STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
 
 	sql = sqlite3_mprintf("SELECT media_thumbnail_path FROM %q WHERE media_path='%q'", DB_TABLE_MEDIA, path);
 
@@ -199,7 +180,7 @@ int _media_svc_get_thumbnail_path_by_path(sqlite3 *handle, const char *path, cha
 		return ret;
 	}
 
-	SAFE_STRLCPY(thumbnail_path, (const char *)sqlite3_column_text(sql_stmt, 0), MEDIA_SVC_PATHNAME_SIZE);
+	g_strlcpy(thumbnail_path, (const char *)sqlite3_column_text(sql_stmt, 0), MEDIA_SVC_PATHNAME_SIZE);
 
 	SQLITE3_FINALIZE(sql_stmt);
 
@@ -211,7 +192,7 @@ int _media_svc_delete_item_by_path(const char *path, uid_t uid)
 	int ret = MS_MEDIA_ERR_NONE;
 	char *sql = NULL;
 
-	media_svc_retvm_if(!MS_STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
+	media_svc_retvm_if(!STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
 
 	sql = sqlite3_mprintf("DELETE FROM %q WHERE media_path=%Q;", DB_TABLE_MEDIA, path);
 
@@ -227,7 +208,7 @@ int _media_svc_update_item_validity(const char *path, int validity, bool stack_q
 	int ret = MS_MEDIA_ERR_NONE;
 	char *sql = NULL;
 
-	media_svc_retvm_if(!MS_STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
+	media_svc_retvm_if(!STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
 
 	media_svc_debug("path=[%s], validity=[%d]", path, validity);
 
@@ -333,7 +314,7 @@ int _media_svc_get_noti_info(sqlite3 *handle, const char *path, media_svc_noti_i
 	char *sql = NULL;
 
 	media_svc_retvm_if(item == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "item is NULL");
-	media_svc_retvm_if(!MS_STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
+	media_svc_retvm_if(!STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
 
 	sql = sqlite3_mprintf("SELECT media_id, media_type, media_mime_type FROM %q WHERE media_path=%Q", DB_TABLE_MEDIA, path);
 	ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt);