From 4b08e9cdb114fc16e0624eb9d84c5258dc23e57d Mon Sep 17 00:00:00 2001 From: "minje.ahn" Date: Tue, 5 Dec 2023 15:04:41 +0900 Subject: [PATCH] [ACR-1804] Remove pinyin Change-Id: I46501f2a8489bfedc31aa64b00a6f19133560283 Signed-off-by: minje.ahn --- packaging/libmedia-service.spec | 2 +- src/common/media-svc-db-utils.c | 8 -------- src/common/media-svc-media-folder.c | 4 ++-- src/common/media-svc-media.c | 17 ++++------------- 4 files changed, 7 insertions(+), 24 deletions(-) diff --git a/packaging/libmedia-service.spec b/packaging/libmedia-service.spec index d8ac1dc..0ce777e 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.4.28 +Version: 0.4.29 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 and PD diff --git a/src/common/media-svc-db-utils.c b/src/common/media-svc-db-utils.c index 5187b59..96b8794 100755 --- a/src/common/media-svc-db-utils.c +++ b/src/common/media-svc-db-utils.c @@ -402,13 +402,6 @@ int _media_svc_init_table_query(void) __add_column_info(&column_list[DB_LIST_MEDIA], "media_is_drm", DB_TYPE_INT, "DEFAULT 0", false, false, true); __add_column_info(&column_list[DB_LIST_MEDIA], "media_storage_type", DB_TYPE_INT, NULL, false, false, true); __add_column_info(&column_list[DB_LIST_MEDIA], "media_timeline", DB_TYPE_INT, "DEFAULT 0", false, false, true); - __add_column_info(&column_list[DB_LIST_MEDIA], "media_file_name_pinyin", DB_TYPE_TEXT, NULL, false, false, false); - __add_column_info(&column_list[DB_LIST_MEDIA], "media_title_pinyin", DB_TYPE_TEXT, NULL, false, false, false); - __add_column_info(&column_list[DB_LIST_MEDIA], "media_album_pinyin", DB_TYPE_TEXT, NULL, false, false, false); - __add_column_info(&column_list[DB_LIST_MEDIA], "media_artist_pinyin", DB_TYPE_TEXT, NULL, false, false, false); - __add_column_info(&column_list[DB_LIST_MEDIA], "media_album_artist_pinyin", DB_TYPE_TEXT, NULL, false, false, false); - __add_column_info(&column_list[DB_LIST_MEDIA], "media_genre_pinyin", DB_TYPE_TEXT, NULL, false, false, false); - __add_column_info(&column_list[DB_LIST_MEDIA], "media_composer_pinyin", DB_TYPE_TEXT, NULL, false, false, false); __add_column_info(&column_list[DB_LIST_MEDIA], "storage_uuid", DB_TYPE_TEXT, NULL, false, false, true); __add_column_info(&column_list[DB_LIST_MEDIA], "validity", DB_TYPE_INT, "DEFAULT 1", false, false, false); __add_column_info(&column_list[DB_LIST_MEDIA], "media_360", DB_TYPE_INT, "DEFAULT 0", false, false, true); @@ -418,7 +411,6 @@ int _media_svc_init_table_query(void) __add_column_info(&column_list[DB_LIST_FOLDER], "folder_path", DB_TYPE_TEXT, "NOT NULL", true, false, false); __add_column_info(&column_list[DB_LIST_FOLDER], "folder_name", DB_TYPE_TEXT, "NOT NULL", false, false, false); __add_column_info(&column_list[DB_LIST_FOLDER], "folder_modified_time", DB_TYPE_INT, "DEFAULT 0", false, false, false); - __add_column_info(&column_list[DB_LIST_FOLDER], "folder_name_pinyin", DB_TYPE_TEXT, NULL, false, false, false); __add_column_info(&column_list[DB_LIST_FOLDER], "folder_storage_type", DB_TYPE_INT, NULL, false, false, false); __add_column_info(&column_list[DB_LIST_FOLDER], "storage_uuid", DB_TYPE_TEXT, NULL, true, false, false); __add_column_info(&column_list[DB_LIST_FOLDER], "validity", DB_TYPE_INT, "DEFAULT 1", false, false, false); diff --git a/src/common/media-svc-media-folder.c b/src/common/media-svc-media-folder.c index 54e9d52..f7c5ff4 100755 --- a/src/common/media-svc-media-folder.c +++ b/src/common/media-svc-media-folder.c @@ -55,8 +55,8 @@ static int __media_svc_append_folder(bool is_direct, const char *storage_id, ms_ folder_modified_date = _media_svc_get_file_time(folder_path); /* Sometime SQLITE3 returns NO_RECORD, so need to consider conflict case.. */ - char *sql = sqlite3_mprintf("INSERT OR IGNORE INTO %q (folder_path, folder_name, storage_uuid, folder_storage_type, folder_modified_time, folder_name_pinyin) VALUES (%Q, %Q, %Q, '%d', '%d', %Q);", - DB_TABLE_FOLDER, folder_path, folder_name, storage_id, storage_type, folder_modified_date, folder_name); + char *sql = sqlite3_mprintf("INSERT OR IGNORE INTO %q (folder_path, folder_name, storage_uuid, folder_storage_type, folder_modified_time) VALUES (%Q, %Q, %Q, '%d', '%d');", + DB_TABLE_FOLDER, folder_path, folder_name, storage_id, storage_type, folder_modified_date); if (is_direct) ret = _media_svc_sql_query_direct(sql, uid); diff --git a/src/common/media-svc-media.c b/src/common/media-svc-media.c index d777b3c..288e484 100755 --- a/src/common/media-svc-media.c +++ b/src/common/media-svc-media.c @@ -77,11 +77,10 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c 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_composer, media_year, media_recorded_date, media_copyright, media_track_num, media_description, \ media_bitrate, media_bitpersample, media_samplerate, media_channel, media_duration, \ - media_longitude, media_latitude, media_altitude, exposure_time, fnumber, iso, model, media_width, media_height, media_datetaken, media_orientation, media_rating, media_is_drm, media_storage_type, media_timeline, \ - media_file_name_pinyin, media_title_pinyin, media_album_pinyin, media_artist_pinyin, media_album_artist_pinyin, media_genre_pinyin, media_composer_pinyin, storage_uuid, media_360"; + media_longitude, media_latitude, media_altitude, exposure_time, fnumber, iso, model, media_width, media_height, media_datetaken, media_orientation, media_rating, media_is_drm, media_storage_type, media_timeline, storage_uuid, media_360"; 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, media_thumbnail_path, \ - album_id, media_is_drm, media_storage_type, media_timeline, media_file_name_pinyin, storage_uuid, media_360"; + album_id, media_is_drm, media_storage_type, media_timeline, storage_uuid, media_360"; /* This sql is due to sqlite3_mprintf's wrong operation when using floating point in the text format */ /* This code will be removed when sqlite3_mprintf works clearly */ @@ -91,7 +90,7 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c 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, %Q, %Q, \ %d, %d, %d, %d, %d, %.6f, %.6f, %.6f, %Q, %.6f, %d, %Q, %d, %d, %Q, %d, \ - %d, %d, %d, %d, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %d);", + %d, %d, %d, %d, %Q, %d);", DB_TABLE_MEDIA, db_fields, content_info->media_uuid, content_info->path, @@ -135,13 +134,6 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c content_info->is_drm, content_info->storage_type, content_info->timeline, - content_info->file_name, - content_info->media_meta.title, - 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.composer, content_info->storage_uuid, content_info->media_meta.is_360 /* 4th line */ ); @@ -151,7 +143,7 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c 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, %Q, %d, %d, %d, %d, %d, %d, %Q, %Q, %d);", + sql = sqlite3_mprintf("INSERT INTO %q(%q) VALUES (%Q, %Q, %Q, %d, %Q, %lld, %d, %d, %lld, %Q, %d, %d, %d, %d, %d, %d, %Q, %d);", DB_TABLE_MEDIA, db_fields_basic, content_info->media_uuid, content_info->path, @@ -167,7 +159,6 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c content_info->is_drm, content_info->storage_type, content_info->timeline, - content_info->file_name, content_info->storage_uuid, content_info->media_meta.is_360 ); -- 2.7.4