From a49c212d3685c1588bf80343838fe56a11a67e03 Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Thu, 19 Mar 2020 12:36:04 +0900 Subject: [PATCH] Change if-else to switch-case Change-Id: If3586b5a3d56e8a8513c7c0784c56b499c41af83 Signed-off-by: Minje Ahn --- src/media_db.c | 226 ++++++++++++++++++++++++++++++++------------------------- 1 file changed, 126 insertions(+), 100 deletions(-) diff --git a/src/media_db.c b/src/media_db.c index ddc5f4d..9f68545 100755 --- a/src/media_db.c +++ b/src/media_db.c @@ -216,27 +216,29 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro snprintf(select_query, sizeof(select_query), SELECT_ALBUM_COUNT, _filter->storage_id); else snprintf(select_query, sizeof(select_query), SELECT_ALBUM_COUNT, DB_VIEW_MEDIA); - break; + case MEDIA_GROUP_FOLDER: if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_FOLDER_COUNT_BY_STORAGE_ID, _filter->storage_id, _filter->storage_id); else snprintf(select_query, sizeof(select_query), SELECT_FOLDER_COUNT, DB_VIEW_MEDIA); - break; + case MEDIA_GROUP_PLAYLIST: if (!SAFE_STRLCPY(select_query, SELECT_PLAYLIST_COUNT, sizeof(select_query))) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } break; + case MEDIA_GROUP_TAG: if (!SAFE_STRLCPY(select_query, SELECT_TAG_COUNT, sizeof(select_query))) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } break; + case MEDIA_GROUP_BOOKMARK: if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_BOOKMARK_COUNT, _filter->storage_id); @@ -244,18 +246,21 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro snprintf(select_query, sizeof(select_query), SELECT_BOOKMARK_COUNT, DB_VIEW_MEDIA); break; + case MEDIA_GROUP_STORAGE: if (!SAFE_STRLCPY(select_query, SELECT_STORAGE_COUNT, sizeof(select_query))) { media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } break; + case MEDIA_GROUP_FACE: if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_FACE_COUNT, _filter->storage_id); else snprintf(select_query, sizeof(select_query), SELECT_FACE_COUNT, DB_VIEW_MEDIA); break; + default: media_content_error("Invalid group type [%d]", group_type); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; @@ -460,21 +465,23 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro select_query = g_strdup_printf(SELECT_ALBUM_COUNT_BY_STORAGE_ID, _filter->storage_id); else select_query = g_strdup(SELECT_ALBUM_COUNT); - break; + case MEDIA_GROUP_FOLDER: if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) select_query = g_strdup_printf(SELECT_FOLDER_COUNT_BY_STORAGE_ID, _filter->storage_id); else select_query = g_strdup(SELECT_FOLDER_COUNT); - break; + case MEDIA_GROUP_PLAYLIST: select_query = g_strdup(SELECT_PLAYLIST_COUNT); break; + case MEDIA_GROUP_TAG: select_query = g_strdup(SELECT_TAG_COUNT); break; + case MEDIA_GROUP_BOOKMARK: if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) select_query = g_strdup_printf(SELECT_BOOKMARK_COUNT_BY_STORAGE_ID, _filter->storage_id); @@ -482,15 +489,18 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro select_query = g_strdup(SELECT_BOOKMARK_COUNT); break; + case MEDIA_GROUP_STORAGE: select_query = g_strdup(SELECT_STORAGE_COUNT); break; + case MEDIA_GROUP_FACE: if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) select_query = g_strdup_printf(SELECT_FACE_COUNT_BY_STORAGE_ID, _filter->storage_id); else select_query = g_strdup(SELECT_FACE_COUNT); break; + default: media_content_error("Invalid group type [%d]", group_type); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; @@ -998,7 +1008,8 @@ int _media_db_get_group_item_count_by_id(int group_id, filter_h filter, group_li memset(select_query, 0x00, sizeof(select_query)); - if (group_type == MEDIA_GROUP_ALBUM) { + switch (group_type) { + case MEDIA_GROUP_ALBUM: #ifdef _USE_TVPD_MODE if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_ALBUM, _filter->storage_id, group_id); @@ -1010,11 +1021,17 @@ int _media_db_get_group_item_count_by_id(int group_id, filter_h filter, group_li else snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_ALBUM, group_id); #endif - } else if (group_type == MEDIA_GROUP_PLAYLIST) { + break; + + case MEDIA_GROUP_PLAYLIST: snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_PLAYLIST, group_id); - } else if (group_type == MEDIA_GROUP_TAG) { + break; + + case MEDIA_GROUP_TAG: snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_TAG, group_id); - } else { + break; + + default: media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -1048,93 +1065,103 @@ int _media_db_get_group_item_count(const char *group_name, filter_h filter, grou memset(select_query, 0x00, sizeof(select_query)); - if (group_type == MEDIA_GROUP_NONE) { - /* There are 2 ways to get count for media table for performance - If user wants to set offset and count, use SQL SELECT_MEDIA_COUNT_FROM_MEDIA. - If user wants to get count without setting count, SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE */ - if (_filter) { - if (_filter->offset < 0 && _filter->count < 0) { + switch (group_type) { + case MEDIA_GROUP_NONE: + if (!_filter) { #ifdef _USE_TVPD_MODE - if (STRING_VALID(_filter->storage_id)) - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE, _filter->storage_id); - else - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE, DB_VIEW_MEDIA); + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE, DB_VIEW_MEDIA); #else - if (STRING_VALID(_filter->storage_id)) - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE_BY_STORAGE_ID, _filter->storage_id); - else - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE); + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE); #endif - } else { + break; + } + + if (_filter->offset < 0 && _filter->count < 0) { #ifdef _USE_TVPD_MODE - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_MEDIA, DB_VIEW_MEDIA); + if (STRING_VALID(_filter->storage_id)) + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE, _filter->storage_id); + else + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE, DB_VIEW_MEDIA); #else - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_MEDIA); + if (STRING_VALID(_filter->storage_id)) + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE_BY_STORAGE_ID, _filter->storage_id); + else + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE); #endif - need_bracket = true; - } } else { #ifdef _USE_TVPD_MODE - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE, DB_VIEW_MEDIA); + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_MEDIA, DB_VIEW_MEDIA); #else - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE); + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_MEDIA); #endif + need_bracket = true; } - } else if (group_type == MEDIA_GROUP_FOLDER) { + break; + + case MEDIA_GROUP_FOLDER: #ifdef _USE_TVPD_MODE - if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) + if (_filter && STRING_VALID(_filter->storage_id)) sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_COUNT_FROM_FOLDER, _filter->storage_id, group_name); else sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_COUNT_FROM_FOLDER, DB_VIEW_MEDIA, group_name); #else - if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) + if (_filter && STRING_VALID(_filter->storage_id)) sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_COUNT_FROM_FOLDER_BY_STORAGE_ID, group_name, _filter->storage_id); else sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_COUNT_FROM_FOLDER, group_name); #endif + break; - } else if (group_type == MEDIA_GROUP_TAG_BY_MEDIA_ID) { + case MEDIA_GROUP_TAG_BY_MEDIA_ID: snprintf(select_query, sizeof(select_query), SELECT_TAG_COUNT_BY_MEDIA_ID, group_name); - } else if (group_type == MEDIA_GROUP_BOOKMARK_BY_MEDIA_ID) { + break; + + case MEDIA_GROUP_BOOKMARK_BY_MEDIA_ID: #ifdef _USE_TVPD_MODE - if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) + if (_filter && STRING_VALID(_filter->storage_id)) sqlite3_snprintf(sizeof(select_query), select_query, SELECT_BOOKMARK_COUNT_BY_MEDIA_ID, _filter->storage_id, group_name); else sqlite3_snprintf(sizeof(select_query), select_query, SELECT_BOOKMARK_COUNT_BY_MEDIA_ID, DB_VIEW_MEDIA, group_name); #else sqlite3_snprintf(sizeof(select_query), select_query, SELECT_BOOKMARK_COUNT_BY_MEDIA_ID, group_name); #endif + break; - } else if (group_type == MEDIA_GROUP_STORAGE) { + case MEDIA_GROUP_STORAGE: #ifdef _USE_TVPD_MODE sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_COUNT_FROM_STORAGE, group_name, group_name); #else sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_COUNT_FROM_STORAGE, group_name); #endif + break; - } else if (group_type == MEDIA_GROUP_FACE_BY_MEDIA_ID) { + case MEDIA_GROUP_FACE_BY_MEDIA_ID: #ifdef _USE_TVPD_MODE - if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) + if (_filter && STRING_VALID(_filter->storage_id)) sqlite3_snprintf(sizeof(select_query), select_query, SELECT_FACE_COUNT_BY_MEDIA_ID, _filter->storage_id, group_name); else sqlite3_snprintf(sizeof(select_query), select_query, SELECT_FACE_COUNT_BY_MEDIA_ID, DB_VIEW_MEDIA, group_name); #else sqlite3_snprintf(sizeof(select_query), select_query, SELECT_FACE_COUNT_BY_MEDIA_ID, group_name); #endif + break; #ifdef _USE_TVPD_MODE - } else if (group_type == MEDIA_GROUP_PVR) { - if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) + case MEDIA_GROUP_PVR: + if (_filter && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_PVR_COUNT_BY_STORAGE_ID, _filter->storage_id); else - SAFE_STRLCAT(select_query, SELECT_PVR_COUNT, sizeof(select_query)); - } else if (group_type == MEDIA_GROUP_UHD) { - if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) + SAFE_STRLCPY(select_query, SELECT_PVR_COUNT, sizeof(select_query)); + break; + + case MEDIA_GROUP_UHD: + if (_filter && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_UHD_COUNT_BY_STORAGE_ID, _filter->storage_id); else - SAFE_STRLCAT(select_query, SELECT_UHD_COUNT, sizeof(select_query)); + SAFE_STRLCPY(select_query, SELECT_UHD_COUNT, sizeof(select_query)); + break; #endif - } else { + default: media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } @@ -1172,47 +1199,54 @@ int _media_db_get_group_item_by_id(int group_id, filter_h filter, media_info_cb memset(select_query, 0x00, sizeof(select_query)); + switch (group_type) { + case MEDIA_GROUP_ALBUM: #ifdef _USE_TVPD_MODE - if (group_type == MEDIA_GROUP_ALBUM) { if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_ALBUM, _filter->storage_id, group_id); else snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_ALBUM, DB_VIEW_MEDIA, group_id); - } else if (group_type == MEDIA_GROUP_PLAYLIST) { - if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_PLAYLIST, _filter->storage_id, group_id); - else - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_PLAYLIST, DB_VIEW_MEDIA, group_id); - } else if (group_type == MEDIA_GROUP_TAG) { - if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_TAG, _filter->storage_id, group_id); - else - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_TAG, DB_VIEW_MEDIA, group_id); - } else { - media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); - return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; - } #else - if (group_type == MEDIA_GROUP_ALBUM) { if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_ALBUM_BY_STORAGE_ID, group_id, _filter->storage_id); else snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_ALBUM, group_id); - } else if (group_type == MEDIA_GROUP_PLAYLIST) { +#endif + break; + + case MEDIA_GROUP_PLAYLIST: +#ifdef _USE_TVPD_MODE + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_PLAYLIST, _filter->storage_id, group_id); + else + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_PLAYLIST, DB_VIEW_MEDIA, group_id); +#else if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_PLAYLIST_BY_STORAGE_ID, group_id, _filter->storage_id); else snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_PLAYLIST, group_id); - } else if (group_type == MEDIA_GROUP_TAG) { +#endif + break; + + case MEDIA_GROUP_TAG: +#ifdef _USE_TVPD_MODE + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_TAG, _filter->storage_id, group_id); + else + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_TAG, DB_VIEW_MEDIA, group_id); +#else if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_TAG_BY_STORAGE_ID, group_id, _filter->storage_id); else snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_TAG, group_id); - } else { +#endif + break; + + default: media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } -#endif + ret = __media_db_make_query(filter, &condition_query, &option_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); @@ -1254,38 +1288,46 @@ int _media_db_get_group_item(const char *group_name, filter_h filter, media_info filter_s *_filter = (filter_s *)filter; memset(select_query, 0x00, sizeof(select_query)); + + switch (group_type) { + case MEDIA_GROUP_NONE: #ifdef _USE_TVPD_MODE - if (group_type == MEDIA_GROUP_NONE) { if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_MEDIA_ITEM, _filter->storage_id); else snprintf(select_query, sizeof(select_query), SELECT_MEDIA_ITEM, DB_VIEW_MEDIA); - } else if (group_type == MEDIA_GROUP_FOLDER) { - if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_FOLDER, _filter->storage_id, group_name); - else - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_FOLDER, DB_VIEW_MEDIA, group_name); - } else if (group_type == MEDIA_GROUP_STORAGE) { - snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_STORAGE, group_name, group_name); - } else { - media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); - return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; - } #else - if (group_type == MEDIA_GROUP_NONE) { if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_MEDIA_ITEM_BY_STORAGE_ID, _filter->storage_id); else snprintf(select_query, sizeof(select_query), SELECT_MEDIA_ITEM); - } else if (group_type == MEDIA_GROUP_FOLDER) { +#endif + break; + + case MEDIA_GROUP_FOLDER: +#ifdef _USE_TVPD_MODE + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_FOLDER, _filter->storage_id, group_name); + else + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_FOLDER, DB_VIEW_MEDIA, group_name); +#else snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_FOLDER, group_name); - } else if (group_type == MEDIA_GROUP_STORAGE) { +#endif + break; + + case MEDIA_GROUP_STORAGE: +#ifdef _USE_TVPD_MODE + snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_STORAGE, group_name, group_name); +#else snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_STORAGE, group_name); - } else { +#endif + break; + + default: media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } -#endif + ret = __media_db_make_query(filter, &condition_query, &option_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); @@ -1412,8 +1454,6 @@ int _media_db_get_media_group_item_count(const char *group_name, filter_h filter sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_COUNT_FROM_GROUP, _filter->storage_id, __media_db_get_group_name(group), group_name); else sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_COUNT_FROM_GROUP, DB_VIEW_MEDIA, __media_db_get_group_name(group), group_name); - - } else { if ((_filter != NULL) && 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)); @@ -1426,8 +1466,6 @@ int _media_db_get_media_group_item_count(const char *group_name, filter_h filter sqlite3_snprintf(sizeof(select_query), select_query, SELECT_PVR_COUNT_FROM_GROUP_BY_STORAGE_ID, _filter->storage_id, __media_db_get_group_name(group), group_name); else sqlite3_snprintf(sizeof(select_query), select_query, SELECT_PVR_COUNT_FROM_GROUP, __media_db_get_group_name(group), group_name); - - } else { if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_PVR_COUNT_FROM_GROUP_NULL_BY_STORAGE_ID, _filter->storage_id, __media_db_get_group_name(group)); @@ -1440,8 +1478,6 @@ int _media_db_get_media_group_item_count(const char *group_name, filter_h filter sqlite3_snprintf(sizeof(select_query), select_query, SELECT_UHD_COUNT_FROM_GROUP_BY_STORAGE_ID, _filter->storage_id, __media_db_get_group_name(group), group_name); else sqlite3_snprintf(sizeof(select_query), select_query, SELECT_UHD_COUNT_FROM_GROUP, __media_db_get_group_name(group), group_name); - - } else { if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_UHD_COUNT_FROM_GROUP_NULL_BY_STORAGE_ID, _filter->storage_id, __media_db_get_group_name(group)); @@ -1451,13 +1487,10 @@ int _media_db_get_media_group_item_count(const char *group_name, filter_h filter } #else if (group_name != NULL) { - if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) { + if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) 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 { + else sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_COUNT_FROM_GROUP, __media_db_get_group_name(group), group_name); - - } } else { if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_GROUP_NULL_BY_STORAGE_ID, __media_db_get_group_name(group), _filter->storage_id); @@ -1465,7 +1498,6 @@ int _media_db_get_media_group_item_count(const char *group_name, filter_h filter snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_GROUP_NULL, __media_db_get_group_name(group)); } #endif - ret = __media_db_make_query(filter, &condition_query, &option_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); @@ -1506,8 +1538,6 @@ int _media_db_get_media_group_item(const char *group_name, filter_h filter, medi sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_FROM_GROUP, _filter->storage_id, __media_db_get_group_name(group), group_name); else sqlite3_snprintf(sizeof(select_query), select_query, SELECT_MEDIA_FROM_GROUP, DB_VIEW_MEDIA, __media_db_get_group_name(group), group_name); - - } else { if ((_filter != NULL) && 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)); @@ -1520,8 +1550,6 @@ int _media_db_get_media_group_item(const char *group_name, filter_h filter, medi 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, __media_db_get_group_name(group), group_name); - - } else { if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_GROUP_NULL_BY_STORAGE_ID, __media_db_get_group_name(group), _filter->storage_id); @@ -1642,8 +1670,6 @@ int _media_db_get_pvr_group_item(const char *group_name, filter_h filter, media_ sqlite3_snprintf(sizeof(select_query), select_query, SELECT_PVR_FROM_GROUP_BY_STORAGE_ID, _filter->storage_id, __media_db_get_group_name(group), group_name); else sqlite3_snprintf(sizeof(select_query), select_query, SELECT_PVR_FROM_GROUP, __media_db_get_group_name(group), group_name); - - } else { if ((_filter != NULL) && STRING_VALID(_filter->storage_id)) snprintf(select_query, sizeof(select_query), SELECT_PVR_FROM_GROUP_NULL_BY_STORAGE_ID, _filter->storage_id, __media_db_get_group_name(group)); -- 2.7.4