From e017c92659eef1832b40135beeb87113c3a6f8d6 Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Fri, 12 Apr 2019 07:50:12 +0900 Subject: [PATCH] Match columns of folder with filter keyword Change-Id: I551696c531daf368c1fee0d8361cec931060da28 Signed-off-by: Minje Ahn --- include/media_info_private.h | 16 +++++----------- include_product/media_info_private.h | 17 +++++------------ src/media_content.c | 7 ------- src/media_folder.c | 10 +++++----- 4 files changed, 15 insertions(+), 35 deletions(-) diff --git a/include/media_info_private.h b/include/media_info_private.h index 2868b79..f58a852 100755 --- a/include/media_info_private.h +++ b/include/media_info_private.h @@ -423,12 +423,6 @@ typedef struct _media_content_cb_data { #define DB_FIELD_MEDIA_DESCRIPTION_PINYIN "description_pinyin" #define DB_FIELD_MEDIA_360 "is_360" -/* DB field for folder */ -#define DB_FIELD_FOLDER_ID "folder_uuid" -#define DB_FIELD_FOLDER_NAME "name" -#define DB_FIELD_FOLDER_STORAGE_TYPE "storage_type" -#define DB_FIELD_FOLDER_NAME_PINYIN "name_pinyin" - /* DB Query Keyword */ #define QUERY_KEYWORD_AND "AND" #define QUERY_KEYWORD_OR "OR" @@ -450,14 +444,14 @@ typedef struct _media_content_cb_data { #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_FOLDER_LIST "SELECT DISTINCT folder_uuid, folder_path, name, storage_type, storage_uuid FROM "FOLDER_MEDIA_JOIN +#define SELECT_FOLDER_LIST "SELECT DISTINCT folder_id, folder_path, folder_name, folder_storage_type, storage_uuid FROM "FOLDER_MEDIA_JOIN #define SELECT_FOLDER_LIST_BY_STORAGE_ID SELECT_FOLDER_LIST"AND storage_uuid='%s' " #define SELECT_TAG_LIST "SELECT DISTINCT tag_id, tag_name FROM "DB_VIEW_TAG" WHERE 1 " #define SELECT_PLAYLIST_LIST "SELECT DISTINCT playlist_id, playlist_name, p_thumbnail_path FROM "DB_VIEW_PLAYLIST" WHERE 1 " /* Get Group Count */ #define SELECT_ALBUM_COUNT "SELECT COUNT(DISTINCT album_id) FROM "ALBUM_MEDIA_JOIN -#define SELECT_FOLDER_COUNT "SELECT COUNT(DISTINCT folder_uuid) FROM "FOLDER_MEDIA_JOIN +#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 " @@ -471,14 +465,14 @@ typedef struct _media_content_cb_data { #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_uuid='%q'" +#define SELECT_MEDIA_COUNT_FROM_FOLDER "SELECT COUNT(*) FROM '%s' WHERE validity=1 AND folder_id='%q'" #define SELECT_MEDIA_COUNT_FROM_STORAGE "SELECT COUNT(*) FROM '%s' WHERE validity=1 AND storage_uuid='%q'" #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) " /* Get Group Info by Group ID*/ #define SELECT_ALBUM_FROM_ALBUM "SELECT name, artist, album_art FROM "DB_TABLE_ALBUM" WHERE album_id=%d" -#define SELECT_FOLDER_FROM_FOLDER "SELECT folder_uuid, folder_path, name, storage_type, storage_uuid FROM "DB_TABLE_FOLDER" WHERE folder_uuid='%s'" +#define SELECT_FOLDER_FROM_FOLDER "SELECT folder_path, folder_name, folder_storage_type, storage_uuid FROM "DB_TABLE_FOLDER" WHERE folder_id='%s'" #define SELECT_PLAYLIST_FROM_PLAYLIST "SELECT playlist_name, thumbnail_path FROM "DB_TABLE_PLAYLIST" WHERE playlist_id=%d" #define SELECT_TAG_FROM_TAG "SELECT tag_name FROM "DB_TABLE_TAG" WHERE tag_id=%d" #define SELECT_TAG_BY_NAME "SELECT tag_id FROM "DB_TABLE_TAG" WHERE tag_name='%q'" @@ -527,7 +521,7 @@ typedef struct _media_content_cb_data { #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_uuid='%s'" +#define SELECT_MEDIA_FROM_FOLDER "SELECT "MEDIA_INFO_ITEM" FROM '%s' 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 '%s' WHERE media_uuid IN (SELECT media_uuid 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_uuid IN (SELECT media_uuid FROM "DB_TABLE_PLAYLIST_MAP" WHERE playlist_id=%d) AND validity=1" diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h index 02b4527..a53745c 100755 --- a/include_product/media_info_private.h +++ b/include_product/media_info_private.h @@ -484,7 +484,6 @@ typedef struct _media_content_scan_cb_data_v2 { #define DB_FIELD_MEDIA_SIZE "size" #define DB_FIELD_MEDIA_ADDED_TIME "added_time" #define DB_FIELD_MEDIA_MODIFIED_TIME "modified_time" -#define DB_FIELD_MEDIA_FOLDER_ID "folder_uuid" #define DB_FIELD_MEDIA_TIMELINE "timeline" #define DB_FIELD_MEDIA_THUMBNAIL_PATH "thumbnail_path" #define DB_FIELD_MEDIA_TITLE "title" @@ -536,12 +535,6 @@ typedef struct _media_content_scan_cb_data_v2 { #define DB_FIELD_MEDIA_APP_DATA "app_data" #endif -/* DB field for folder */ -#define DB_FIELD_FOLDER_ID "folder_uuid" -#define DB_FIELD_FOLDER_NAME "name" -#define DB_FIELD_FOLDER_STORAGE_TYPE "storage_type" -#define DB_FIELD_FOLDER_NAME_PINYIN "name_pinyin" - /* DB field for PVR*/ #define DB_FIELD_PVR_DURATION "duration" #define DB_FIELD_PVR_TIME_ZONE "timezone" @@ -618,14 +611,14 @@ typedef struct _media_content_scan_cb_data_v2 { #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_FOLDER_LIST "SELECT DISTINCT folder_uuid, folder_path, name, storage_type, storage_uuid FROM "FOLDER_MEDIA_JOIN +#define SELECT_FOLDER_LIST "SELECT DISTINCT folder_id, folder_path, folder_name, folder_storage_type, storage_uuid FROM "FOLDER_MEDIA_JOIN #define SELECT_FOLDER_LIST_BY_STORAGE_ID SELECT_FOLDER_LIST"AND storage_uuid='%s' " #define SELECT_TAG_LIST "SELECT DISTINCT tag_id, tag_name FROM "DB_VIEW_TAG" WHERE 1 " #define SELECT_PLAYLIST_LIST "SELECT DISTINCT playlist_id, playlist_name, p_thumbnail_path FROM "DB_VIEW_PLAYLIST" WHERE 1 " /* Get Group Count */ #define SELECT_ALBUM_COUNT "SELECT COUNT(DISTINCT album_id) FROM "ALBUM_MEDIA_JOIN -#define SELECT_FOLDER_COUNT "SELECT COUNT(DISTINCT folder_uuid) FROM "FOLDER_MEDIA_JOIN +#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 " @@ -639,14 +632,14 @@ typedef struct _media_content_scan_cb_data_v2 { #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_uuid='%q'" +#define SELECT_MEDIA_COUNT_FROM_FOLDER "SELECT COUNT(*) FROM '%s' WHERE validity=1 AND folder_id='%q'" #define SELECT_MEDIA_COUNT_FROM_STORAGE "SELECT COUNT(*) FROM '%s' WHERE validity=1 AND storage_uuid='%q'" #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) " /* Get Group Info by Group ID*/ #define SELECT_ALBUM_FROM_ALBUM "SELECT name, artist, album_art FROM "DB_TABLE_ALBUM" WHERE album_id=%d" -#define SELECT_FOLDER_FROM_FOLDER "SELECT folder_uuid, folder_path, name, storage_type, storage_uuid FROM "DB_TABLE_FOLDER" WHERE folder_uuid='%s'" +#define SELECT_FOLDER_FROM_FOLDER "SELECT folder_path, folder_name, folder_storage_type, storage_uuid FROM "DB_TABLE_FOLDER" WHERE folder_id='%s'" #define SELECT_PLAYLIST_FROM_PLAYLIST "SELECT playlist_name, thumbnail_path FROM "DB_TABLE_PLAYLIST" WHERE playlist_id=%d" #define SELECT_TAG_FROM_TAG "SELECT tag_name FROM "DB_TABLE_TAG" WHERE tag_id=%d" #define SELECT_TAG_BY_NAME "SELECT tag_id FROM "DB_TABLE_TAG" WHERE tag_name='%q'" @@ -704,7 +697,7 @@ typedef struct _media_content_scan_cb_data_v2 { #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_uuid='%s'" +#define SELECT_MEDIA_FROM_FOLDER "SELECT "MEDIA_INFO_ITEM" FROM '%s' 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 '%s' WHERE media_uuid IN (SELECT media_uuid 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_uuid IN (SELECT media_uuid FROM "DB_TABLE_PLAYLIST_MAP" WHERE playlist_id=%d) AND validity=1" diff --git a/src/media_content.c b/src/media_content.c index 3456f35..3f8487d 100755 --- a/src/media_content.c +++ b/src/media_content.c @@ -18,7 +18,6 @@ #include #include - static attribute_h g_attr_handle = NULL; static sqlite3 *db_handle = NULL; static int ref_count = 0; @@ -83,12 +82,6 @@ static media_content_attribute_info_s g_content_attrs_info[] = { {MEDIA_COPYRIGHT_PINYIN, DB_FIELD_MEDIA_COPYRIGHT_PINYIN}, {MEDIA_DESCRIPTION_PINYIN, DB_FIELD_MEDIA_DESCRIPTION_PINYIN}, - /* Folder */ - {FOLDER_ID, DB_FIELD_FOLDER_ID}, - {FOLDER_NAME, DB_FIELD_FOLDER_NAME}, - {FOLDER_STORAGE_TYPE, DB_FIELD_FOLDER_STORAGE_TYPE}, - {FOLDER_NAME_PINYIN, DB_FIELD_FOLDER_NAME_PINYIN}, - #ifdef _USE_SENIOR_MODE {MEDIA_CONTACT, DB_FIELD_MEDIA_CONTACT}, {MEDIA_APP_DATA, DB_FIELD_MEDIA_APP_DATA}, diff --git a/src/media_folder.c b/src/media_folder.c index f14d4a5..e331b8f 100755 --- a/src/media_folder.c +++ b/src/media_folder.c @@ -339,11 +339,11 @@ int media_folder_get_folder_from_db(const char *folder_id, media_folder_h *folde return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } - _folder->folder_id = g_strdup((const char *)sqlite3_column_text(stmt, 0)); - _folder->path = g_strdup((const char *)sqlite3_column_text(stmt, 1)); - _folder->name = g_strdup((const char *)sqlite3_column_text(stmt, 2)); - _folder->storage_type = (int)sqlite3_column_int(stmt, 3); - _folder->storage_uuid = g_strdup((const char *)sqlite3_column_text(stmt, 4)); + _folder->folder_id = g_strdup(folder_id); + _folder->path = g_strdup((const char *)sqlite3_column_text(stmt, 0)); + _folder->name = g_strdup((const char *)sqlite3_column_text(stmt, 1)); + _folder->storage_type = (int)sqlite3_column_int(stmt, 2); + _folder->storage_uuid = g_strdup((const char *)sqlite3_column_text(stmt, 3)); *folder = (media_folder_h)_folder; } -- 2.7.4