From: minje.ahn Date: Tue, 12 Mar 2024 06:49:16 +0000 (+0900) Subject: Remove query length checker X-Git-Tag: accepted/tizen/unified/20240320.110714~4 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fmultimedia%2Flibmedia-service.git;a=commitdiff_plain;h=f64c28a18827b4995b8cd73d98ea8b875205895f Remove query length checker This check code was TV product feature. But it has been removed from tizen_tv_fork. So we sync it as public. Change-Id: I06e58b9d0aa2fd6db8173745ad8401ddf92f9d18 Signed-off-by: minje.ahn --- diff --git a/packaging/libmedia-service.spec b/packaging/libmedia-service.spec index fc8ff1d..3be3e72 100644 --- 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.5.2 +Version: 0.5.3 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/common/media-svc-media.c b/src/common/media-svc-media.c index e88b931..66318df 100755 --- a/src/common/media-svc-media.c +++ b/src/common/media-svc-media.c @@ -67,73 +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_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_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, %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->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, %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->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; } diff --git a/src/common/media-svc.c b/src/common/media-svc.c index cee35e1..c8837f0 100755 --- a/src/common/media-svc.c +++ b/src/common/media-svc.c @@ -230,7 +230,7 @@ int media_svc_insert_item_bulk(sqlite3 *handle, const char *storage_id, const ch content_info.folder_id = folder_id; media_svc_retv_del_if(content_info.folder_id <= 0, MS_MEDIA_ERR_INTERNAL, &content_info); - ret = _media_svc_insert_item_with_data(true, &content_info, true, uid); + ret = _media_svc_insert_item_stack(&content_info); media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info); if (g_insert_with_noti) @@ -309,8 +309,7 @@ int media_svc_insert_item_immediately(sqlite3 *handle, const char *storage_id, c } } - ret = _media_svc_insert_item_with_data(false, &content_info, false, uid); - + ret = _media_svc_insert_item(&content_info, uid); if (ret == MS_MEDIA_ERR_NONE) { media_svc_debug("Insertion is successful. Sending noti for this"); _media_svc_publish_noti(MS_MEDIA_ITEM_INSERT, content_info.path, content_info.media_type, content_info.media_uuid, content_info.mime_type); diff --git a/src/include/common/media-svc-media.h b/src/include/common/media-svc-media.h index 5c79751..d2f750c 100755 --- a/src/include/common/media-svc-media.h +++ b/src/include/common/media-svc-media.h @@ -27,7 +27,8 @@ int _media_svc_check_data_by_path(sqlite3 *handle, const char *path); int _media_svc_get_modified_time(sqlite3 *handle, const char *path, int *modified_time); -int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *content_info, bool stack_query, uid_t uid); +int _media_svc_insert_item_stack(media_svc_content_info_s *content_info); +int _media_svc_insert_item(media_svc_content_info_s *content_info, uid_t uid); int _media_svc_update_item_with_data(bool is_direct, media_svc_content_info_s *content_info, uid_t uid); int _media_svc_get_thumbnail_path_by_path(sqlite3 *handle, const char *path, char *thumbnail_path); int _media_svc_delete_item_by_path(const char *path, uid_t uid);