From: Minje Ahn Date: Fri, 5 Apr 2019 01:15:52 +0000 (+0900) Subject: Fix album query X-Git-Tag: submit/tizen/20190405.070252^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F30%2F202830%2F2;p=platform%2Fcore%2Fapi%2Fmedia-content.git Fix album query 1. Use column name instead of * 2. Append album_art when select query Change-Id: I29d7298776326b960dfee2c68be80bf320879944 Signed-off-by: Minje Ahn --- diff --git a/include/media_info_private.h b/include/media_info_private.h index d4e4c75..efdcc25 100755 --- a/include/media_info_private.h +++ b/include/media_info_private.h @@ -480,7 +480,7 @@ typedef struct _media_content_cb_data { #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 * FROM "DB_TABLE_ALBUM" WHERE album_id=%d" +#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_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" diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h index 5b793c9..53209d5 100755 --- a/include_product/media_info_private.h +++ b/include_product/media_info_private.h @@ -648,7 +648,7 @@ typedef struct _media_content_scan_cb_data_v2 { #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 * FROM "DB_TABLE_ALBUM" WHERE album_id=%d" +#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_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" diff --git a/src/media_group.c b/src/media_group.c index 693cedf..270e801 100755 --- a/src/media_group.c +++ b/src/media_group.c @@ -98,9 +98,10 @@ int media_album_get_album_from_db(int album_id, media_album_h *album) return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; } - _album->album_id = (int)sqlite3_column_int(stmt, 0); - _album->name = g_strdup((const char *)sqlite3_column_text(stmt, 1)); - _album->artist = g_strdup((const char *)sqlite3_column_text(stmt, 2)); + _album->album_id = album_id; + _album->name = g_strdup((const char *)sqlite3_column_text(stmt, 0)); + _album->artist = g_strdup((const char *)sqlite3_column_text(stmt, 1)); + _album->album_art_path = g_strdup((const char *)sqlite3_column_text(stmt, 2)); *album = (media_album_h)_album; }