From b3e0278ec75567036575aea52d7ad69585528945 Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Fri, 28 Jun 2024 08:19:06 +0900 Subject: [PATCH] Merge media tables on TV profile This patch brings the following changes: 1. Media information from external storage is inserted into the media table. 2. According to 1., 'media_view' and related codes are deleted. 3. Tables are no longer created or deleted during runtime. 4. When a new external storage is inserted, information about the old external storage is deleted. 5. According to 4., db storage space check is deleted. Change-Id: I69cb27756da9be60ef0e98e8885840ccc6e07aa2 Signed-off-by: Minje Ahn --- include_product/media_info_private.h | 76 ++++++++++------- packaging/capi-content-media-content.spec | 2 +- src/media_db.c | 130 +++++++++++------------------- src/media_info.c | 87 +------------------- src/media_playlist.c | 4 - 5 files changed, 100 insertions(+), 199 deletions(-) diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h index b4210e9..5f03330 100644 --- a/include_product/media_info_private.h +++ b/include_product/media_info_private.h @@ -410,7 +410,6 @@ typedef struct _media_content_scan_cb_data_v2 { /* DB View */ #define DB_VIEW_PLAYLIST "playlist_view" #define DB_VIEW_TAG "tag_view" -#define DB_VIEW_MEDIA "media_view" /* DB field for media */ #define DB_FIELD_MEDIA_DISPLAY_NAME "media_display_name" @@ -444,17 +443,20 @@ typedef struct _media_content_scan_cb_data_v2 { #define DB_FIELD_PVR_MODIFIED_DATE "modified_date" /* DB TABLE JOIN */ -#define FOLDER_MEDIA_JOIN DB_TABLE_FOLDER" NATURAL LEFT OUTER JOIN '%s' WHERE validity=1 " -#define BOOKMARK_MEDIA_JOIN DB_TABLE_BOOKMARK" NATURAL JOIN '%s' WHERE validity=1 " -#define ALBUM_MEDIA_JOIN DB_TABLE_ALBUM" NATURAL JOIN '%s' WHERE validity=1 " -#define FACE_MEDIA_JOIN DB_TABLE_FACE" NATURAL JOIN '%s' WHERE validity=1 " +#define FOLDER_MEDIA_JOIN DB_TABLE_FOLDER" NATURAL LEFT OUTER JOIN "DB_TABLE_MEDIA" WHERE validity=1 " +#define BOOKMARK_MEDIA_JOIN DB_TABLE_BOOKMARK" NATURAL JOIN "DB_TABLE_MEDIA" WHERE validity=1 " +#define ALBUM_MEDIA_JOIN DB_TABLE_ALBUM" NATURAL JOIN "DB_TABLE_MEDIA" WHERE validity=1 " +#define FACE_MEDIA_JOIN DB_TABLE_FACE" NATURAL JOIN "DB_TABLE_MEDIA" WHERE validity=1 " /* Get Group info */ -#define SELECT_MEDIA_GROUP_AND_COUNT "SELECT %s, COUNT(*) FROM '%s' WHERE validity=1 " +#define SELECT_MEDIA_GROUP_AND_COUNT "SELECT %s, COUNT(*) FROM "DB_TABLE_MEDIA" WHERE validity=1 " +#define SELECT_MEDIA_GROUP_AND_COUNT_BY_STORAGE_ID SELECT_MEDIA_GROUP_AND_COUNT"AND storage_uuid='%s' " /* Get Group List */ #define SELECT_ALBUM_LIST "SELECT DISTINCT album_id, name, artist, album_art FROM "ALBUM_MEDIA_JOIN -#define SELECT_MEDIA_GROUP_LIST "SELECT DISTINCT %s FROM '%s' WHERE validity=1 " +#define SELECT_ALBUM_LIST_BY_STORAGE_ID SELECT_ALBUM_LIST"AND storage_uuid='%s' " +#define SELECT_MEDIA_GROUP_LIST "SELECT DISTINCT %s FROM "DB_TABLE_MEDIA" WHERE validity=1 " +#define SELECT_MEDIA_GROUP_LIST_BY_STORAGE_ID SELECT_MEDIA_GROUP_LIST"AND storage_uuid='%s' " #define SELECT_FOLDER_LIST "SELECT DISTINCT folder_id, folder_path, folder_name, storage_uuid FROM "FOLDER_MEDIA_JOIN #define SELECT_FOLDER_LIST_BY_STORAGE_ID SELECT_FOLDER_LIST"AND storage_uuid='%s' " @@ -463,21 +465,29 @@ typedef struct _media_content_scan_cb_data_v2 { /* Get Group Count */ #define SELECT_ALBUM_COUNT "SELECT COUNT(DISTINCT album_id) FROM "ALBUM_MEDIA_JOIN +#define SELECT_ALBUM_COUNT_BY_STORAGE_ID SELECT_ALBUM_COUNT"AND storage_uuid='%s' " #define SELECT_FOLDER_COUNT "SELECT COUNT(DISTINCT folder_id) FROM "FOLDER_MEDIA_JOIN #define SELECT_FOLDER_COUNT_BY_STORAGE_ID SELECT_FOLDER_COUNT"AND storage_uuid='%s' " #define SELECT_TAG_COUNT "SELECT COUNT(DISTINCT tag_id) FROM "DB_VIEW_TAG" WHERE 1 " #define SELECT_PLAYLIST_COUNT "SELECT COUNT(DISTINCT playlist_id) FROM "DB_VIEW_PLAYLIST" WHERE 1 " #define SELECT_BOOKMARK_COUNT "SELECT COUNT(*) FROM "BOOKMARK_MEDIA_JOIN +#define SELECT_BOOKMARK_COUNT_BY_STORAGE_ID SELECT_BOOKMARK_COUNT"AND storage_uuid='%s' " #define SELECT_MEDIA_GROUP_COUNT "SELECT COUNT(*) FROM ("SELECT_MEDIA_GROUP_LIST +#define SELECT_MEDIA_GROUP_COUNT_BY_STORAGE_ID SELECT_MEDIA_GROUP_COUNT"AND storage_uuid='%s' " /*count(distinct x) count only non-null values, but select distinct X returns include null. so sync the result of count and list, don't use count(distinct x)*/ /* Get Media Count of Group */ -#define SELECT_MEDIA_COUNT_FROM_MEDIA "SELECT COUNT(*) FROM (SELECT media_id FROM '%s' WHERE validity=1 " -#define SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE "SELECT COUNT(*) FROM '%s' WHERE validity=1 " -#define SELECT_MEDIA_COUNT_FROM_ALBUM "SELECT COUNT(*) FROM '%s' WHERE validity=1 AND album_id='%d'" -#define SELECT_MEDIA_COUNT_FROM_GROUP "SELECT COUNT(*) FROM ("SELECT_MEDIA_FROM_GROUP /*to apply limit condition. */ -#define SELECT_MEDIA_COUNT_FROM_GROUP_NULL "SELECT COUNT(*) FROM ("SELECT_MEDIA_FROM_GROUP_NULL /* to apply limit condition. */ -#define SELECT_MEDIA_COUNT_FROM_FOLDER "SELECT COUNT(*) FROM '%s' WHERE validity=1 AND folder_id='%s'" +#define SELECT_MEDIA_COUNT_FROM_MEDIA "SELECT COUNT(*) FROM (SELECT media_id FROM "DB_TABLE_MEDIA" WHERE validity=1 " +#define SELECT_MEDIA_COUNT_FROM_MEDIA_BY_STORAGE_ID SELECT_MEDIA_COUNT_FROM_MEDIA"AND storage_id='%s' " +#define SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE validity=1 " +#define SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE_BY_STORAGE_ID SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE"AND storage_uuid='%s' " +#define SELECT_MEDIA_COUNT_FROM_ALBUM "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE validity=1 AND album_id='%d'" +#define SELECT_MEDIA_COUNT_FROM_ALBUM_BY_STORAGE_ID SELECT_MEDIA_COUNT_FROM_ALBUM" AND storage_uuid='%s'" +#define SELECT_MEDIA_COUNT_FROM_GROUP "SELECT COUNT(*) FROM ("SELECT_MEDIA_FROM_GROUP +#define SELECT_MEDIA_COUNT_FROM_GROUP_BY_STORAGE_ID SELECT_MEDIA_COUNT_FROM_GROUP" AND storage_uuid='%s'" +#define SELECT_MEDIA_COUNT_FROM_GROUP_NULL "SELECT COUNT(*) FROM ("SELECT_MEDIA_FROM_GROUP_NULL +#define SELECT_MEDIA_COUNT_FROM_GROUP_NULL_BY_STORAGE_ID SELECT_MEDIA_COUNT_FROM_GROUP_NULL" AND storage_uuid='%s'" +#define SELECT_MEDIA_COUNT_FROM_FOLDER "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE validity=1 AND folder_id='%s' " #define SELECT_MEDIA_COUNT_FROM_TAG "SELECT COUNT(*) FROM "DB_VIEW_TAG" WHERE (tag_id=%d AND tag_media_count>0) " #define SELECT_MEDIA_COUNT_FROM_PLAYLIST "SELECT COUNT(*) FROM "DB_VIEW_PLAYLIST" WHERE (playlist_id=%d and playlist_media_count>0) " @@ -518,22 +528,30 @@ typedef struct _media_content_scan_cb_data_v2 { #define INSERT_BOOKMARK_TO_BOOKMARK "INSERT INTO "DB_TABLE_BOOKMARK" (media_id, bookmark_marked_time, bookmark_thumbnail_path, bookmark_name) VALUES ('%q', '%d', %Q, %Q)" #define SELECT_BOOKMARK_COUNT_BY_MEDIA_ID "SELECT COUNT(*) FROM "BOOKMARK_MEDIA_JOIN" AND media_id='%s'" #define SELECT_BOOKMARK_LIST "SELECT bookmark_id, media_id, bookmark_marked_time, bookmark_thumbnail_path, bookmark_name FROM "BOOKMARK_MEDIA_JOIN +#define SELECT_BOOKMARK_LIST_BY_STORAGE_ID SELECT_BOOKMARK_LIST"AND storage_uuid='%s' " #define SELECT_BOOKMARK_LIST_BY_MEDIA_ID "SELECT bookmark_id, media_id, bookmark_marked_time, bookmark_thumbnail_path, bookmark_name FROM "BOOKMARK_MEDIA_JOIN" AND media_id='%s'" #define SELECT_BOOKMARK_ID_FROM_BOOKMARK "SELECT bookmark_id FROM "DB_TABLE_BOOKMARK" WHERE media_id='%s' AND bookmark_marked_time=%d" #define UPDATE_BOOKMARK_FROM_BOOKMARK "UPDATE "DB_TABLE_BOOKMARK" SET bookmark_name=%Q WHERE bookmark_id=%d;" -#define SELECT_MEDIA_ITEM "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1" -#define SELECT_MEDIA_FROM_MEDIA "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND media_id='%s'" -#define SELECT_MEDIA_BY_PATH "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND media_path='%q'" -#define SELECT_MEDIA_FROM_ALBUM "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND album_id=%d" -#define SELECT_MEDIA_FROM_GROUP "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND %s='%q'" -#define SELECT_MEDIA_FROM_GROUP_NULL "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND %s IS NULL" -#define SELECT_MEDIA_FROM_FOLDER "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND folder_id='%s'" -#define SELECT_MEDIA_FROM_TAG "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE media_id IN (SELECT media_id FROM "DB_TABLE_TAG_MAP" WHERE tag_id=%d) AND validity=1" -#define SELECT_MEDIA_FROM_PLAYLIST "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE media_id IN (SELECT media_id FROM "DB_TABLE_PLAYLIST_MAP" WHERE playlist_id=%d) AND validity=1" -#define SELECT_MEDIA_PATH_BY_ID "SELECT media_path FROM "DB_VIEW_MEDIA" WHERE media_id='%q'" -#define SELECT_MEDIA_STORAGE_ID_BY_ID "SELECT storage_uuid FROM "DB_VIEW_MEDIA" WHERE media_id='%q'" +#define SELECT_MEDIA_ITEM "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity=1" +#define SELECT_MEDIA_ITEM_BY_STORAGE_ID SELECT_MEDIA_ITEM" AND storage_uuid='%s'" +#define SELECT_MEDIA_FROM_MEDIA "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity=1 AND media_id='%s'" +#define SELECT_MEDIA_BY_PATH "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity=1 AND media_path='%q'" +#define SELECT_MEDIA_FROM_ALBUM "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity=1 AND album_id=%d " +#define SELECT_MEDIA_FROM_ALBUM_BY_STORAGE_ID SELECT_MEDIA_FROM_ALBUM" AND storage_uuid='%s' " +#define SELECT_MEDIA_FROM_GROUP "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity=1 AND %s='%q'" +#define SELECT_MEDIA_FROM_GROUP_BY_STORAGE_ID SELECT_MEDIA_FROM_GROUP" AND storage_uuid='%s'" +#define SELECT_MEDIA_FROM_GROUP_NULL "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity=1 AND %s IS NULL" +#define SELECT_MEDIA_FROM_GROUP_NULL_BY_STORAGE_ID SELECT_MEDIA_FROM_GROUP_NULL" AND storage_uuid='%s'" +#define SELECT_MEDIA_FROM_FOLDER "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity=1 AND folder_id='%s'" +#define SELECT_MEDIA_FROM_STORAGE "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND storage_uuid='%s'" +#define SELECT_MEDIA_FROM_TAG "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE media_id IN (SELECT media_id FROM "DB_TABLE_TAG_MAP" WHERE tag_id=%d) AND validity=1" +#define SELECT_MEDIA_FROM_TAG_BY_STORAGE_ID SELECT_MEDIA_FROM_TAG" AND storage_uuid='%s'" +#define SELECT_MEDIA_FROM_PLAYLIST "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE media_id IN (SELECT media_id FROM "DB_TABLE_PLAYLIST_MAP" WHERE playlist_id=%d) AND validity=1" +#define SELECT_MEDIA_FROM_PLAYLIST_BY_STORAGE_ID SELECT_MEDIA_FROM_PLAYLIST" AND storage_uuid='%s'" +#define SELECT_MEDIA_PATH_BY_ID "SELECT media_path FROM "DB_TABLE_MEDIA" WHERE media_id='%q'" +#define SELECT_MEDIA_STORAGE_ID_BY_ID "SELECT storage_uuid FROM "DB_TABLE_MEDIA" WHERE media_id='%q'" /* Delete */ #define DELETE_PLAYLIST_FROM_PLAYLIST "DELETE FROM "DB_TABLE_PLAYLIST" WHERE playlist_id=%d" @@ -541,17 +559,21 @@ typedef struct _media_content_scan_cb_data_v2 { #define DELETE_BOOKMARK_FROM_BOOKMARK "DELETE FROM "DB_TABLE_BOOKMARK" WHERE bookmark_id=%d" /* Storage*/ +#define SELECT_STORAGE_COUNT "SELECT COUNT(*) FROM "DB_TABLE_STORAGE" WHERE validity=1" #define SELECT_STORAGE_LIST "SELECT storage_id, storage_path FROM "DB_TABLE_STORAGE" WHERE validity=1" +#define SELECT_STORAGE_INFO_FROM_STORAGE "SELECT storage_path FROM "DB_TABLE_STORAGE" WHERE validity=1 AND storage_id='%s'" /* Face */ #define DELETE_FACE_FROM_FACE "DELETE FROM "DB_TABLE_FACE" WHERE media_face_id=%d" #define INSERT_FACE_TO_FACE "INSERT INTO "DB_TABLE_FACE" (media_id, face_rect_x , face_rect_y, face_rect_w, face_rect_h, face_orientation, media_face_tag) VALUES ('%q', %d, %d, %d, %d, %d, %Q);" #define UPDATE_FACE_TO_FACE "UPDATE "DB_TABLE_FACE" SET face_rect_x=%d, face_rect_y=%d, face_rect_w=%d, face_rect_h=%d, face_orientation=%d, media_face_tag=%Q WHERE media_face_id=%d" -#define SELECT_MEDIA_COUNT_FROM_MEDIA_BY_ID "SELECT COUNT(*) FROM "DB_VIEW_MEDIA" WHERE media_id='%q' AND validity=1" -#define SELECT_IMAGE_COUNT_FROM_MEDIA_BY_ID "SELECT COUNT(*) FROM "DB_VIEW_MEDIA" WHERE media_id='%q' AND media_type=0 AND validity=1" +#define SELECT_MEDIA_COUNT_FROM_MEDIA_BY_ID "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE media_id='%q' AND validity=1" +#define SELECT_IMAGE_COUNT_FROM_MEDIA_BY_ID "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE media_id='%q' AND media_type=0 AND validity=1" #define SELECT_FACE_COUNT "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN +#define SELECT_FACE_COUNT_BY_STORAGE_ID SELECT_FACE_COUNT"AND storage_uuid='%s' " #define SELECT_FACE_COUNT_BY_MEDIA_ID "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN" AND media_id='%s'" #define SELECT_FACE_LIST "SELECT media_face_id, media_id, face_rect_x, face_rect_y, face_rect_w, face_rect_h, face_orientation, media_face_tag FROM "FACE_MEDIA_JOIN +#define SELECT_FACE_LIST_BY_STORAGE_ID SELECT_FACE_LIST"AND storage_uuid='%s' " #define SELECT_FACE_LIST_BY_MEDIA_ID "SELECT media_face_id, media_id, face_rect_x, face_rect_y, face_rect_w, face_rect_h, face_orientation, media_face_tag FROM "FACE_MEDIA_JOIN" AND media_id='%s'" #define UPDATE_MEDIA_INFO_IN_FACE_SCAN_LIST "UPDATE "DB_TABLE_FACE_SCAN_LIST" SET modified_time = 0 WHERE media_id IN (SELECT media_id FROM "DB_TABLE_FACE" WHERE media_face_id=%d)" #define SELECT_FACE_ID "SELECT media_face_id FROM "DB_TABLE_FACE" WHERE media_id='%q' AND face_rect_x=%d AND face_rect_y=%d AND face_rect_w=%d AND face_rect_h=%d AND face_orientation=%d" @@ -590,7 +612,7 @@ int _content_error_capi(int internal_error); int _content_query_sql(char *query_str); sqlite3 * _content_get_db_handle(void); uid_t _content_get_uid(void); -int _media_info_get_media_info_from_db(const char *path, const char *storage_id, media_info_h media); +int _media_info_get_media_info_from_db(const char *path, media_info_h media); void _media_info_item_get_detail(sqlite3_stmt *stmt, media_info_h media); int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *group_count); int _media_db_get_media_group_count(media_group_e group, filter_h filter, int *group_count); diff --git a/packaging/capi-content-media-content.spec b/packaging/capi-content-media-content.spec index bc674f4..e6bbcc0 100644 --- a/packaging/capi-content-media-content.spec +++ b/packaging/capi-content-media-content.spec @@ -1,6 +1,6 @@ Name: capi-content-media-content Summary: A Media content library in Tizen Native API -Version: 0.5.6 +Version: 0.5.7 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/media_db.c b/src/media_db.c index d62c641..b0bb304 100644 --- a/src/media_db.c +++ b/src/media_db.c @@ -115,16 +115,16 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro switch (group_type) { case MEDIA_GROUP_ALBUM: if (_filter && STRING_VALID(_filter->storage_id)) - select_query = g_strdup_printf(SELECT_ALBUM_COUNT, _filter->storage_id); + select_query = g_strdup_printf(SELECT_ALBUM_COUNT_BY_STORAGE_ID, _filter->storage_id); else - select_query = g_strdup_printf(SELECT_ALBUM_COUNT, DB_VIEW_MEDIA); + select_query = g_strdup(SELECT_ALBUM_COUNT); break; case MEDIA_GROUP_FOLDER: if (_filter && STRING_VALID(_filter->storage_id)) - select_query = g_strdup_printf(SELECT_FOLDER_COUNT_BY_STORAGE_ID, _filter->storage_id, _filter->storage_id); + select_query = g_strdup_printf(SELECT_FOLDER_COUNT_BY_STORAGE_ID, _filter->storage_id); else - select_query = g_strdup_printf(SELECT_FOLDER_COUNT, DB_VIEW_MEDIA); + select_query = g_strdup(SELECT_FOLDER_COUNT); break; case MEDIA_GROUP_PLAYLIST: @@ -137,17 +137,17 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro case MEDIA_GROUP_BOOKMARK: if (_filter && STRING_VALID(_filter->storage_id)) - select_query = g_strdup_printf(SELECT_BOOKMARK_COUNT, _filter->storage_id); + select_query = g_strdup_printf(SELECT_BOOKMARK_COUNT_BY_STORAGE_ID, _filter->storage_id); else - select_query = g_strdup_printf(SELECT_BOOKMARK_COUNT, DB_VIEW_MEDIA); + select_query = g_strdup(SELECT_BOOKMARK_COUNT); break; case MEDIA_GROUP_FACE: if (_filter && STRING_VALID(_filter->storage_id)) - select_query = g_strdup_printf(SELECT_FACE_COUNT, _filter->storage_id); + select_query = g_strdup_printf(SELECT_FACE_COUNT_BY_STORAGE_ID, _filter->storage_id); else - select_query = g_strdup_printf(SELECT_FACE_COUNT, DB_VIEW_MEDIA); + select_query = g_strdup(SELECT_FACE_COUNT); break; default: @@ -189,9 +189,9 @@ int _media_db_get_media_group_count(media_group_e group, filter_h filter, int *g if (group < MEDIA_CONTENT_GROUP_MAX) { /*media content*/ if (_filter && STRING_VALID(_filter->storage_id)) - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_COUNT, __media_db_get_group_name(group), _filter->storage_id); + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_COUNT_BY_STORAGE_ID, __media_db_get_group_name(group), _filter->storage_id); else - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_COUNT, __media_db_get_group_name(group), DB_VIEW_MEDIA); + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_COUNT, __media_db_get_group_name(group)); } else { /*pvr content*/ if (_filter && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_PVR_GROUP_COUNT_BY_STORAGE_ID, __media_db_get_group_name(group), _filter->storage_id); @@ -236,9 +236,9 @@ int _media_db_get_media_group(media_group_e group, filter_h filter, media_group_ if (group < MEDIA_CONTENT_GROUP_MAX) { /*media content */ if (_filter && STRING_VALID(_filter->storage_id)) - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_LIST, __media_db_get_group_name(group), _filter->storage_id); + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_LIST_BY_STORAGE_ID, __media_db_get_group_name(group), _filter->storage_id); else - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_LIST, __media_db_get_group_name(group), DB_VIEW_MEDIA); + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_LIST, __media_db_get_group_name(group)); } else { /*pvr content */ if (_filter && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_PVR_GROUP_LIST_BY_STORAGE_ID, __media_db_get_group_name(group), _filter->storage_id); @@ -285,9 +285,9 @@ int _media_db_get_media_group_and_count(media_group_e group, filter_h filter, me if (group < MEDIA_CONTENT_GROUP_MAX) { /*media content*/ if (_filter && STRING_VALID(_filter->storage_id)) - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_AND_COUNT, group_name, _filter->storage_id); + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_AND_COUNT_BY_STORAGE_ID, group_name, _filter->storage_id); else - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_AND_COUNT, group_name, DB_VIEW_MEDIA); + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_AND_COUNT, group_name); } else {/*pvr content*/ if (_filter && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_PVR_GROUP_AND_COUNT_BY_STORAGE_ID, group_name, _filter->storage_id); @@ -466,9 +466,9 @@ int _media_db_get_album(filter_h filter, media_album_cb callback, void *user_dat #ifdef _USE_TVPD_MODE filter_s *_filter = (filter_s *)filter; if (_filter && STRING_VALID(_filter->storage_id)) - select_query = g_strdup_printf(SELECT_ALBUM_LIST, _filter->storage_id); + select_query = g_strdup_printf(SELECT_ALBUM_LIST_BY_STORAGE_ID, _filter->storage_id); else - select_query = g_strdup_printf(SELECT_ALBUM_LIST, DB_VIEW_MEDIA); + select_query = g_strdup(SELECT_ALBUM_LIST); #else select_query = g_strdup(SELECT_ALBUM_LIST); #endif @@ -515,9 +515,9 @@ int _media_db_get_folder(filter_h filter, media_folder_cb callback, void *user_d #ifdef _USE_TVPD_MODE filter_s *_filter = (filter_s *)filter; if (_filter && STRING_VALID(_filter->storage_id)) - select_query = g_strdup_printf(SELECT_FOLDER_LIST_BY_STORAGE_ID, _filter->storage_id, _filter->storage_id); + select_query = g_strdup_printf(SELECT_FOLDER_LIST_BY_STORAGE_ID, _filter->storage_id); else - select_query = g_strdup_printf(SELECT_FOLDER_LIST, DB_VIEW_MEDIA); + select_query = g_strdup(SELECT_FOLDER_LIST); #else select_query = g_strdup(SELECT_FOLDER_LIST); #endif @@ -683,15 +683,12 @@ int _media_db_get_bookmark(const char *media_id, filter_h filter, media_bookmark #ifdef _USE_TVPD_MODE filter_s *_filter = (filter_s *)filter; if (STRING_VALID(media_id)) { //get bookmark by media_id - if (_filter && STRING_VALID(_filter->storage_id)) - select_query = g_strdup_printf(SELECT_BOOKMARK_LIST_BY_MEDIA_ID, _filter->storage_id, media_id); - else - select_query = g_strdup_printf(SELECT_BOOKMARK_LIST_BY_MEDIA_ID, DB_VIEW_MEDIA, media_id); + select_query = g_strdup_printf(SELECT_BOOKMARK_LIST_BY_MEDIA_ID, media_id); } else { if (_filter && STRING_VALID(_filter->storage_id)) - select_query = g_strdup_printf(SELECT_BOOKMARK_LIST, _filter->storage_id); + select_query = g_strdup_printf(SELECT_BOOKMARK_LIST_BY_STORAGE_ID, _filter->storage_id); else - select_query = g_strdup_printf(SELECT_BOOKMARK_LIST, DB_VIEW_MEDIA); + select_query = g_strdup(SELECT_BOOKMARK_LIST); } #else if (STRING_VALID(media_id)) @@ -745,15 +742,12 @@ int _media_db_get_face(const char *media_id, filter_h filter, media_face_cb call #ifdef _USE_TVPD_MODE filter_s *_filter = (filter_s *)filter; if (STRING_VALID(media_id)) { //get face by media_id - if (_filter && STRING_VALID(_filter->storage_id)) - select_query = g_strdup_printf(SELECT_FACE_LIST_BY_MEDIA_ID, _filter->storage_id, media_id); - else - select_query = g_strdup_printf(SELECT_FACE_LIST_BY_MEDIA_ID, DB_VIEW_MEDIA, media_id); + select_query = g_strdup_printf(SELECT_FACE_LIST_BY_MEDIA_ID, media_id); } else { if (_filter && STRING_VALID(_filter->storage_id)) - select_query = g_strdup_printf(SELECT_FACE_LIST, _filter->storage_id); + select_query = g_strdup_printf(SELECT_FACE_LIST_BY_STORAGE_ID, _filter->storage_id); else - select_query = g_strdup_printf(SELECT_FACE_LIST, DB_VIEW_MEDIA); + select_query = g_strdup(SELECT_FACE_LIST); } #else if (STRING_VALID(media_id)) @@ -813,9 +807,9 @@ int _media_db_get_group_item_count_by_id(int group_id, filter_h filter, group_li case MEDIA_GROUP_ALBUM: #ifdef _USE_TVPD_MODE if (_filter && STRING_VALID(_filter->storage_id)) - select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_ALBUM, _filter->storage_id, group_id); + select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_ALBUM_BY_STORAGE_ID, group_id, _filter->storage_id); else - select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_ALBUM, DB_VIEW_MEDIA, group_id); + select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_ALBUM, group_id); #else select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_ALBUM, group_id); #endif @@ -868,29 +862,25 @@ int _media_db_get_group_item_count(const char *group_name, filter_h filter, grou switch (group_type) { case MEDIA_GROUP_NONE: if (!_filter) { -#ifdef _USE_TVPD_MODE - select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE, DB_VIEW_MEDIA); -#else select_query = g_strdup(SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE); -#endif break; } if (_filter->offset < 0 && _filter->count < 0) { #ifdef _USE_TVPD_MODE if (STRING_VALID(_filter->storage_id)) - select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE, _filter->storage_id); + select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE_BY_STORAGE_ID, _filter->storage_id); else - select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE, DB_VIEW_MEDIA); + select_query = g_strdup(SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE); #else select_query = g_strdup(SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE); #endif } else { #ifdef _USE_TVPD_MODE if (STRING_VALID(_filter->storage_id)) - select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_MEDIA, _filter->storage_id); + select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_MEDIA_BY_STORAGE_ID, _filter->storage_id); else - select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_MEDIA, DB_VIEW_MEDIA); + select_query = g_strdup(SELECT_MEDIA_COUNT_FROM_MEDIA); #else select_query = g_strdup(SELECT_MEDIA_COUNT_FROM_MEDIA); #endif @@ -899,14 +889,7 @@ int _media_db_get_group_item_count(const char *group_name, filter_h filter, grou break; case MEDIA_GROUP_FOLDER: -#ifdef _USE_TVPD_MODE - if (_filter && STRING_VALID(_filter->storage_id)) - select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_FOLDER, _filter->storage_id, group_name); - else - select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_FOLDER, DB_VIEW_MEDIA, group_name); -#else select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_FOLDER, group_name); -#endif break; case MEDIA_GROUP_TAG_BY_MEDIA_ID: @@ -914,25 +897,11 @@ int _media_db_get_group_item_count(const char *group_name, filter_h filter, grou break; case MEDIA_GROUP_BOOKMARK_BY_MEDIA_ID: -#ifdef _USE_TVPD_MODE - if (_filter && STRING_VALID(_filter->storage_id)) - select_query = g_strdup_printf(SELECT_BOOKMARK_COUNT_BY_MEDIA_ID, _filter->storage_id, group_name); - else - select_query = g_strdup_printf(SELECT_BOOKMARK_COUNT_BY_MEDIA_ID, DB_VIEW_MEDIA, group_name); -#else select_query = g_strdup_printf(SELECT_BOOKMARK_COUNT_BY_MEDIA_ID, group_name); -#endif break; case MEDIA_GROUP_FACE_BY_MEDIA_ID: -#ifdef _USE_TVPD_MODE - if (_filter && STRING_VALID(_filter->storage_id)) - select_query = g_strdup_printf(SELECT_FACE_COUNT_BY_MEDIA_ID, _filter->storage_id, group_name); - else - select_query = g_strdup_printf(SELECT_FACE_COUNT_BY_MEDIA_ID, DB_VIEW_MEDIA, group_name); -#else select_query = g_strdup_printf(SELECT_FACE_COUNT_BY_MEDIA_ID, group_name); -#endif break; default: @@ -981,9 +950,9 @@ int _media_db_get_group_item_by_id(int group_id, filter_h filter, media_info_cb case MEDIA_GROUP_ALBUM: #ifdef _USE_TVPD_MODE if (_filter && STRING_VALID(_filter->storage_id)) - select_query = g_strdup_printf(SELECT_MEDIA_FROM_ALBUM, _filter->storage_id, group_id); + select_query = g_strdup_printf(SELECT_MEDIA_FROM_ALBUM_BY_STORAGE_ID, group_id, _filter->storage_id); else - select_query = g_strdup_printf(SELECT_MEDIA_FROM_ALBUM, DB_VIEW_MEDIA, group_id); + select_query = g_strdup_printf(SELECT_MEDIA_FROM_ALBUM, group_id); #else select_query = g_strdup_printf(SELECT_MEDIA_FROM_ALBUM, group_id); #endif @@ -992,9 +961,9 @@ int _media_db_get_group_item_by_id(int group_id, filter_h filter, media_info_cb case MEDIA_GROUP_PLAYLIST: #ifdef _USE_TVPD_MODE if (_filter && STRING_VALID(_filter->storage_id)) - select_query = g_strdup_printf(SELECT_MEDIA_FROM_PLAYLIST, _filter->storage_id, group_id); + select_query = g_strdup_printf(SELECT_MEDIA_FROM_PLAYLIST_BY_STORAGE_ID, group_id, _filter->storage_id); else - select_query = g_strdup_printf(SELECT_MEDIA_FROM_PLAYLIST, DB_VIEW_MEDIA, group_id); + select_query = g_strdup_printf(SELECT_MEDIA_FROM_PLAYLIST, group_id); #else select_query = g_strdup_printf(SELECT_MEDIA_FROM_PLAYLIST, group_id); #endif @@ -1003,9 +972,9 @@ int _media_db_get_group_item_by_id(int group_id, filter_h filter, media_info_cb case MEDIA_GROUP_TAG: #ifdef _USE_TVPD_MODE if (_filter && STRING_VALID(_filter->storage_id)) - select_query = g_strdup_printf(SELECT_MEDIA_FROM_TAG, _filter->storage_id, group_id); + select_query = g_strdup_printf(SELECT_MEDIA_FROM_TAG_BY_STORAGE_ID, group_id, _filter->storage_id); else - select_query = g_strdup_printf(SELECT_MEDIA_FROM_TAG, DB_VIEW_MEDIA, group_id); + select_query = g_strdup_printf(SELECT_MEDIA_FROM_TAG, group_id); #else select_query = g_strdup_printf(SELECT_MEDIA_FROM_TAG, group_id); #endif @@ -1061,23 +1030,16 @@ int _media_db_get_group_item(const char *group_name, filter_h filter, media_info case MEDIA_GROUP_NONE: #ifdef _USE_TVPD_MODE if (_filter && STRING_VALID(_filter->storage_id)) - select_query = g_strdup_printf(SELECT_MEDIA_ITEM, _filter->storage_id); + select_query = g_strdup_printf(SELECT_MEDIA_ITEM_BY_STORAGE_ID, _filter->storage_id); else - select_query = g_strdup_printf(SELECT_MEDIA_ITEM, DB_VIEW_MEDIA); + select_query = g_strdup(SELECT_MEDIA_ITEM); #else select_query = g_strdup(SELECT_MEDIA_ITEM); #endif break; case MEDIA_GROUP_FOLDER: -#ifdef _USE_TVPD_MODE - if (_filter && STRING_VALID(_filter->storage_id)) - select_query = g_strdup_printf(SELECT_MEDIA_FROM_FOLDER, _filter->storage_id, group_name); - else - select_query = g_strdup_printf(SELECT_MEDIA_FROM_FOLDER, DB_VIEW_MEDIA, group_name); -#else select_query = g_strdup_printf(SELECT_MEDIA_FROM_FOLDER, group_name); -#endif break; default: @@ -1130,14 +1092,14 @@ int _media_db_get_media_group_item_count(const char *group_name, filter_h filter if (group < MEDIA_CONTENT_GROUP_MAX) { /*media content */ if (group_name) { if (_filter && STRING_VALID(_filter->storage_id)) - sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_COUNT_FROM_GROUP, _filter->storage_id, __media_db_get_group_name(group), group_name); + sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_COUNT_FROM_GROUP_BY_STORAGE_ID, __media_db_get_group_name(group), group_name, _filter->storage_id); else - sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_COUNT_FROM_GROUP, DB_VIEW_MEDIA, __media_db_get_group_name(group), group_name); + sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_COUNT_FROM_GROUP, __media_db_get_group_name(group), group_name); } else { if (_filter && STRING_VALID(_filter->storage_id)) - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_GROUP_NULL, _filter->storage_id, __media_db_get_group_name(group)); + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_GROUP_NULL_BY_STORAGE_ID, __media_db_get_group_name(group), _filter->storage_id); else - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_GROUP_NULL, DB_VIEW_MEDIA, __media_db_get_group_name(group)); + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_GROUP_NULL, __media_db_get_group_name(group)); } } else {/*pvr content*/ if (group_name) { @@ -1196,14 +1158,14 @@ int _media_db_get_media_group_item(const char *group_name, filter_h filter, medi filter_s *_filter = (filter_s *)filter; if (group_name) { if (_filter && STRING_VALID(_filter->storage_id)) - sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_FROM_GROUP, _filter->storage_id, __media_db_get_group_name(group), group_name); + sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_FROM_GROUP_BY_STORAGE_ID, __media_db_get_group_name(group), group_name, _filter->storage_id); else - sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_FROM_GROUP, DB_VIEW_MEDIA, __media_db_get_group_name(group), group_name); + sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_FROM_GROUP, __media_db_get_group_name(group), group_name); } else { if (_filter && STRING_VALID(_filter->storage_id)) - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_GROUP_NULL, _filter->storage_id, __media_db_get_group_name(group)); + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_GROUP_NULL_BY_STORAGE_ID, __media_db_get_group_name(group), _filter->storage_id); else - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_GROUP_NULL, DB_VIEW_MEDIA, __media_db_get_group_name(group)); + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_GROUP_NULL, __media_db_get_group_name(group)); } #else if (group_name) diff --git a/src/media_info.c b/src/media_info.c index 90f4827..a27b1f7 100644 --- a/src/media_info.c +++ b/src/media_info.c @@ -259,34 +259,7 @@ void _media_info_item_get_detail(sqlite3_stmt *stmt, media_info_h media) _media->book_meta->publisher = g_strdup((const char *)sqlite3_column_text(stmt, MEDIA_INFO_COPYRIGHT)); } } -#ifdef _USE_TVPD_MODE -int _media_info_get_media_info_from_db(const char *path, const char *storage_id, media_info_h media) -{ - int ret = MEDIA_CONTENT_ERROR_NONE; - sqlite3_stmt *stmt = NULL; - char *select_query = NULL; - media_info_s *_media = (media_info_s*)media; - - content_retip_if_fail(media); - - select_query = sqlite3_mprintf(SELECT_MEDIA_BY_PATH, storage_id, path); - - ret = _content_get_result(select_query, &stmt); - sqlite3_free(select_query); - content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - - if (sqlite3_step(stmt) == SQLITE_ROW) { - _media_info_item_get_detail(stmt, (media_info_h)_media); - } else { - content_sec_error("No media : path[%s] storage id[%s]", path, storage_id); - ret = MEDIA_CONTENT_ERROR_DB_FAILED; - } - - sqlite3_finalize(stmt); - return ret; -} -#else int _media_info_get_media_info_from_db(const char *path, media_info_h media) { int ret = MEDIA_CONTENT_ERROR_NONE; @@ -314,7 +287,6 @@ int _media_info_get_media_info_from_db(const char *path, media_info_h media) return ret; } -#endif int media_info_insert_to_db(const char *path, media_info_h *info) { @@ -367,19 +339,10 @@ int media_info_insert_to_db(const char *path, media_info_h *info) } media_info_s *_media = g_new0(media_info_s, 1); - -#ifdef _USE_TVPD_MODE - if (strlen(storage_id) > 0) - ret = _media_info_get_media_info_from_db(path, storage_id, (media_info_h)_media); - else - ret = _media_info_get_media_info_from_db(path, DB_TABLE_MEDIA, (media_info_h)_media); - - *info = (media_info_h)_media; -#else ret = _media_info_get_media_info_from_db(path, (media_info_h)_media); *info = (media_info_h)_media; -#endif + return ret; } @@ -396,20 +359,13 @@ int media_info_insert_batch_to_db(const char **path_array, unsigned int array_le int media_info_get_media_info_by_path_from_db(const char* path, media_info_h* media) { int ret = MEDIA_CONTENT_ERROR_NONE; - char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0, }; content_retip_if_fail(STRING_VALID(path)); content_retip_if_fail(media); - ret = media_svc_get_storage_id(_content_get_db_handle(), path, storage_id, tzplatform_getuid(TZ_USER_NAME)); - if (ret != MS_MEDIA_ERR_NONE) { - content_error("media_svc_get_storage_id failed : %d", ret); - return _content_error_capi(ret); - } - media_info_s *_media = g_new0(media_info_s, 1); - ret = _media_info_get_media_info_from_db(path, storage_id, (media_info_h)_media); + ret = _media_info_get_media_info_from_db(path, (media_info_h)_media); *media = (media_info_h)_media; return ret; @@ -1178,16 +1134,8 @@ int media_info_get_media_from_db(const char *media_id, media_info_h *media) content_retip_if_fail(STRING_VALID(media_id)); content_retip_if_fail(media); -#ifdef _USE_TVPD_MODE - char *storage_id = NULL; - - ret = _media_db_get_storage_id_by_media_id(media_id, &storage_id); - content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - snprintf(select_query, DEFAULT_QUERY_SIZE, SELECT_MEDIA_FROM_MEDIA, storage_id, media_id); - g_free(storage_id); -#else snprintf(select_query, DEFAULT_QUERY_SIZE, SELECT_MEDIA_FROM_MEDIA, media_id); -#endif + ret = _content_get_result(select_query, &stmt); content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); @@ -1218,23 +1166,8 @@ int media_info_get_media_from_db_by_path(const char *path, media_info_h *media) ret = _media_util_check_file_exist(path); content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, ret, "_media_util_check_file_exist failed : %d", ret); -#ifdef _USE_TVPD_MODE - char storage_id[MEDIA_CONTENT_UUID_SIZE + 1] = {0, }; - - ret = media_svc_get_storage_id(_content_get_db_handle(), path, storage_id, _content_get_uid()); - if (ret != MS_MEDIA_ERR_NONE) { - content_error("media_svc_get_storage_id failed : %d", ret); - return _content_error_capi(ret); - } -#endif - _media = g_new0(media_info_s, 1); - -#ifdef _USE_TVPD_MODE - ret = _media_info_get_media_info_from_db(path, (strlen(storage_id) > 0) ? storage_id : DB_TABLE_MEDIA, (media_info_h)_media); -#else ret = _media_info_get_media_info_from_db(path, (media_info_h)_media); -#endif if (ret != MEDIA_CONTENT_ERROR_NONE) { g_free(_media); _media = NULL; @@ -1295,9 +1228,6 @@ int media_info_move_to_db(media_info_h media, const char* dst_path) int ret = MEDIA_CONTENT_ERROR_NONE; char repl_path[MAX_PATH_LEN] = {0, }; media_info_s *_info = NULL; -#ifdef _USE_TVPD_MODE - char storage_id[MEDIA_CONTENT_UUID_SIZE + 1] = {0, }; -#endif content_retip_if_fail(media); content_retip_if_fail(STRING_VALID(dst_path)); @@ -1326,16 +1256,7 @@ int media_info_move_to_db(media_info_h media, const char* dst_path) /* Update media_info handle */ _info = g_new0(media_info_s, 1); - -#ifdef _USE_TVPD_MODE - ret = media_svc_get_storage_id(_content_get_db_handle(), repl_path, storage_id, _content_get_uid()); - content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); - - ret = _media_info_get_media_info_from_db(repl_path, storage_id, (media_info_h)_info); -#else ret = _media_info_get_media_info_from_db(repl_path, (media_info_h)_info); -#endif - g_free(_media->display_name); _media->display_name = g_strdup(_info->display_name); g_free(_media->file_path); @@ -1417,4 +1338,4 @@ int media_info_cancel_face_detection(media_info_h media) return MEDIA_CONTENT_ERROR_NONE; } -// LCOV_EXCL_STOP \ No newline at end of file +// LCOV_EXCL_STOP diff --git a/src/media_playlist.c b/src/media_playlist.c index bda7c96..4d86d37 100644 --- a/src/media_playlist.c +++ b/src/media_playlist.c @@ -595,11 +595,7 @@ static int __media_playlist_get_media_id_by_path(const char *path, char **media_ content_retip_if_fail(path); content_retip_if_fail(media_id); -#ifdef _USE_TVPD_MODE - query = sqlite3_mprintf("SELECT media_id FROM '%q' WHERE media_path='%q'", DB_VIEW_MEDIA, path); -#else query = sqlite3_mprintf("SELECT media_id FROM '%q' WHERE media_path='%q'", DB_TABLE_MEDIA, path); -#endif ret = _content_get_result(query, &stmt); sqlite3_free(query); content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, ret, "Failed to get media_id"); -- 2.7.4