add APIs to get storage info
[platform/core/api/media-content.git] / src / media_db.c
index 0c51ee2..a1baf37 100755 (executable)
@@ -67,12 +67,6 @@ static const char * __media_db_get_group_name(media_group_e group)
                return DB_FIELD_MEDIA_MODIFIED_DATE;
        case MEDIA_CONTENT_GROUP_MODIFIED_DATE:
                return DB_FIELD_MEDIA_MODIFIED_DATE;
-#endif
-#ifdef _USE_SENIOR_MODE
-       case MEDIA_CONTENT_GROUP_CONTACT:
-               return DB_FIELD_MEDIA_CONTACT;
-#endif
-#ifdef _USE_TVPD_MODE
        case MEDIA_CONTENT_GROUP_ALBUM:
                return DB_FIELD_MEDIA_ALBUM;
        case MEDIA_PVR_GROUP_DURATION:
@@ -239,10 +233,6 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro
 
                break;
 
-       case MEDIA_GROUP_STORAGE:
-               select_query = g_strdup(SELECT_STORAGE_COUNT);
-               break;
-
        case MEDIA_GROUP_FACE:
                if (_filter && STRING_VALID(_filter->storage_id))
                        select_query = g_strdup_printf(SELECT_FACE_COUNT, _filter->storage_id);
@@ -442,21 +432,14 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro
        char *select_query = NULL;
        char *condition_query = NULL;
        char *option_query = NULL;
-       filter_s *_filter = (filter_s *)filter;
 
        switch (group_type) {
        case MEDIA_GROUP_ALBUM:
-               if (_filter && STRING_VALID(_filter->storage_id))
-                       select_query = g_strdup_printf(SELECT_ALBUM_COUNT_BY_STORAGE_ID, _filter->storage_id);
-               else
-                       select_query = g_strdup(SELECT_ALBUM_COUNT);
+               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);
-               else
-                       select_query = g_strdup(SELECT_FOLDER_COUNT);
+               select_query = g_strdup(SELECT_FOLDER_COUNT);
                break;
 
        case MEDIA_GROUP_PLAYLIST:
@@ -468,22 +451,11 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro
                break;
 
        case MEDIA_GROUP_BOOKMARK:
-               if (_filter && STRING_VALID(_filter->storage_id))
-                       select_query = g_strdup_printf(SELECT_BOOKMARK_COUNT_BY_STORAGE_ID, _filter->storage_id);
-               else
-                       select_query = g_strdup(SELECT_BOOKMARK_COUNT);
-
-               break;
-
-       case MEDIA_GROUP_STORAGE:
-               select_query = g_strdup(SELECT_STORAGE_COUNT);
+               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_BY_STORAGE_ID, _filter->storage_id);
-               else
-                       select_query = g_strdup(SELECT_FACE_COUNT);
+               select_query = g_strdup(SELECT_FACE_COUNT);
                break;
 
        default:
@@ -518,12 +490,8 @@ int _media_db_get_media_group_count(media_group_e group, filter_h filter, int *g
        char *select_query = NULL;
        char *condition_query = NULL;
        char *option_query = NULL;
-       filter_s *_filter = (filter_s *)filter;
 
-       if (_filter && STRING_VALID(_filter->storage_id))
-               select_query = g_strdup_printf(SELECT_MEDIA_GROUP_COUNT_BY_STORAGE_ID, __media_db_get_group_name(group), __media_db_get_group_name(group), _filter->storage_id);
-       else
-               select_query = g_strdup_printf(SELECT_MEDIA_GROUP_COUNT, __media_db_get_group_name(group), __media_db_get_group_name(group));
+       select_query = g_strdup_printf(SELECT_MEDIA_GROUP_COUNT, __media_db_get_group_name(group), __media_db_get_group_name(group));
 
        ret = __media_db_make_query(filter, &condition_query, &option_query);
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
@@ -553,12 +521,8 @@ int _media_db_get_media_group(media_group_e group, filter_h filter, media_group_
        char *option_query = NULL;
        char *name = NULL;
        sqlite3_stmt *stmt = NULL;
-       filter_s *_filter = (filter_s *)filter;
 
-       if (_filter && STRING_VALID(_filter->storage_id))
-               select_query = g_strdup_printf(SELECT_MEDIA_GROUP_LIST_BY_STORAGE_ID, __media_db_get_group_name(group), _filter->storage_id);
-       else
-               select_query = g_strdup_printf(SELECT_MEDIA_GROUP_LIST, __media_db_get_group_name(group));
+       select_query = g_strdup_printf(SELECT_MEDIA_GROUP_LIST, __media_db_get_group_name(group));
 
        ret = __media_db_make_query(filter, &condition_query, &option_query);
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
@@ -596,18 +560,14 @@ int _media_db_get_album(filter_h filter, media_album_cb callback, void *user_dat
        char *condition_query = NULL;
        char *option_query = NULL;
        sqlite3_stmt *stmt = NULL;
-       filter_s *_filter = (filter_s *)filter;
-
 #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);
        else
                select_query = g_strdup_printf(SELECT_ALBUM_LIST, DB_VIEW_MEDIA);
 #else
-       if (_filter && STRING_VALID(_filter->storage_id))
-               select_query = g_strdup_printf(SELECT_ALBUM_LIST_BY_STORAGE_ID, _filter->storage_id);
-       else
-               select_query = g_strdup(SELECT_ALBUM_LIST);
+       select_query = g_strdup(SELECT_ALBUM_LIST);
 #endif
        ret = __media_db_make_query(filter, &condition_query, &option_query);
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
@@ -649,18 +609,14 @@ int _media_db_get_folder(filter_h filter, media_folder_cb callback, void *user_d
        char *condition_query = NULL;
        char *option_query = NULL;
        sqlite3_stmt *stmt = NULL;
-       filter_s *_filter = (filter_s *)filter;
-
 #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);
        else
                select_query = g_strdup_printf(SELECT_FOLDER_LIST, DB_VIEW_MEDIA);
 #else
-       if (_filter && STRING_VALID(_filter->storage_id))
-               select_query = g_strdup_printf(SELECT_FOLDER_LIST_BY_STORAGE_ID, _filter->storage_id);
-       else
-               select_query = g_strdup(SELECT_FOLDER_LIST);
+       select_query = g_strdup(SELECT_FOLDER_LIST);
 #endif
        ret = __media_db_make_query(filter, &condition_query, &option_query);
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
@@ -676,8 +632,11 @@ int _media_db_get_folder(filter_h filter, media_folder_cb callback, void *user_d
 
        while (sqlite3_step(stmt) == SQLITE_ROW) {
                media_folder_s *_folder = g_new0(media_folder_s, 1);
-
+#ifdef _USE_TVPD_MODE
                _folder->folder_id = g_strdup((const char *)sqlite3_column_text(stmt, 0));
+#else
+               _folder->folder_id = g_strdup_printf("%lld", sqlite3_column_int64(stmt, 0));
+#endif
                _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 = sqlite3_column_int(stmt, 3);
@@ -823,9 +782,8 @@ int _media_db_get_bookmark(const char *media_id, filter_h filter, media_bookmark
        char *condition_query = NULL;
        char *option_query = NULL;
        sqlite3_stmt *stmt = NULL;
-       filter_s *_filter = (filter_s *)filter;
-
 #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);
@@ -838,14 +796,10 @@ int _media_db_get_bookmark(const char *media_id, filter_h filter, media_bookmark
                        select_query = g_strdup_printf(SELECT_BOOKMARK_LIST, DB_VIEW_MEDIA);
        }
 #else
-       if (STRING_VALID(media_id)) {   //get bookmark by media_id
+       if (STRING_VALID(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_BY_STORAGE_ID, _filter->storage_id);
-               else
-                       select_query = g_strdup(SELECT_BOOKMARK_LIST);
-       }
+       else
+               select_query = g_strdup(SELECT_BOOKMARK_LIST);
 #endif
 
        ret = __media_db_make_query(filter, &condition_query, &option_query);
@@ -890,9 +844,8 @@ int _media_db_get_face(const char *media_id, filter_h filter, media_face_cb call
        char *condition_query = NULL;
        char *option_query = NULL;
        sqlite3_stmt *stmt = NULL;
-       filter_s *_filter = (filter_s *)filter;
-
 #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);
@@ -905,14 +858,10 @@ int _media_db_get_face(const char *media_id, filter_h filter, media_face_cb call
                        select_query = g_strdup_printf(SELECT_FACE_LIST, DB_VIEW_MEDIA);
        }
 #else
-       if (STRING_VALID(media_id)) {   //get face by media_id
+       if (STRING_VALID(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_BY_STORAGE_ID, _filter->storage_id);
-               else
-                       select_query = g_strdup(SELECT_FACE_LIST);
-       }
+       else
+               select_query = g_strdup(SELECT_FACE_LIST);
 #endif
        ret = __media_db_make_query(filter, &condition_query, &option_query);
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
@@ -959,8 +908,9 @@ int _media_db_get_group_item_count_by_id(int group_id, filter_h filter, group_li
        char *select_query = NULL;
        char *condition_query = NULL;
        char *option_query = NULL;
+#ifdef _USE_TVPD_MODE
        filter_s *_filter = (filter_s *)filter;
-
+#endif
        switch (group_type) {
        case MEDIA_GROUP_ALBUM:
 #ifdef _USE_TVPD_MODE
@@ -969,10 +919,7 @@ int _media_db_get_group_item_count_by_id(int group_id, filter_h filter, group_li
                else
                        select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_ALBUM, DB_VIEW_MEDIA, group_id);
 #else
-               if (_filter && STRING_VALID(_filter->storage_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, group_id);
+               select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_ALBUM, group_id);
 #endif
                break;
 
@@ -1038,10 +985,7 @@ int _media_db_get_group_item_count(const char *group_name, filter_h filter, grou
                        else
                                select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE, DB_VIEW_MEDIA);
 #else
-                       if (STRING_VALID(_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(SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE);
+                       select_query = g_strdup(SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE);
 #endif
                } else {
 #ifdef _USE_TVPD_MODE
@@ -1050,10 +994,7 @@ int _media_db_get_group_item_count(const char *group_name, filter_h filter, grou
                        else
                                select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_MEDIA, DB_VIEW_MEDIA);
 #else
-                       if (STRING_VALID(_filter->storage_id))
-                               select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_MEDIA_BY_STORAGE_ID, _filter->storage_id);
-                       else
-                               select_query = g_strdup(SELECT_MEDIA_COUNT_FROM_MEDIA);
+                       select_query = g_strdup(SELECT_MEDIA_COUNT_FROM_MEDIA);
 #endif
                        need_bracket = true;
                }
@@ -1066,10 +1007,7 @@ int _media_db_get_group_item_count(const char *group_name, filter_h filter, grou
                else
                        select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_FOLDER, DB_VIEW_MEDIA, group_name);
 #else
-               if (_filter && STRING_VALID(_filter->storage_id))
-                       select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_FOLDER_BY_STORAGE_ID, group_name, _filter->storage_id);
-               else
-                       select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_FOLDER, group_name);
+               select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_FOLDER, group_name);
 #endif
                break;
 
@@ -1088,14 +1026,6 @@ int _media_db_get_group_item_count(const char *group_name, filter_h filter, grou
 #endif
                break;
 
-       case MEDIA_GROUP_STORAGE:
-#ifdef _USE_TVPD_MODE
-               select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_STORAGE, group_name, group_name);
-#else
-               select_query = g_strdup_printf(SELECT_MEDIA_COUNT_FROM_STORAGE, group_name);
-#endif
-               break;
-
        case MEDIA_GROUP_FACE_BY_MEDIA_ID:
 #ifdef _USE_TVPD_MODE
                if (_filter && STRING_VALID(_filter->storage_id))
@@ -1160,7 +1090,9 @@ int _media_db_get_group_item_by_id(int group_id, filter_h filter, media_info_cb
        char *condition_query = NULL;
        char *option_query = NULL;
        sqlite3_stmt *stmt = NULL;
+#ifdef _USE_TVPD_MODE
        filter_s *_filter = (filter_s *)filter;
+#endif
 
        switch (group_type) {
        case MEDIA_GROUP_ALBUM:
@@ -1170,10 +1102,7 @@ int _media_db_get_group_item_by_id(int group_id, filter_h filter, media_info_cb
                else
                        select_query = g_strdup_printf(SELECT_MEDIA_FROM_ALBUM, DB_VIEW_MEDIA, group_id);
 #else
-               if (_filter && STRING_VALID(_filter->storage_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, group_id);
+               select_query = g_strdup_printf(SELECT_MEDIA_FROM_ALBUM, group_id);
 #endif
                break;
 
@@ -1184,10 +1113,7 @@ int _media_db_get_group_item_by_id(int group_id, filter_h filter, media_info_cb
                else
                        select_query = g_strdup_printf(SELECT_MEDIA_FROM_PLAYLIST, DB_VIEW_MEDIA, group_id);
 #else
-               if (_filter && STRING_VALID(_filter->storage_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, group_id);
+               select_query = g_strdup_printf(SELECT_MEDIA_FROM_PLAYLIST, group_id);
 #endif
                break;
 
@@ -1198,10 +1124,7 @@ int _media_db_get_group_item_by_id(int group_id, filter_h filter, media_info_cb
                else
                        select_query = g_strdup_printf(SELECT_MEDIA_FROM_TAG, DB_VIEW_MEDIA, group_id);
 #else
-               if (_filter && STRING_VALID(_filter->storage_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, group_id);
+               select_query = g_strdup_printf(SELECT_MEDIA_FROM_TAG, group_id);
 #endif
                break;
 
@@ -1247,7 +1170,9 @@ int _media_db_get_group_item(const char *group_name, filter_h filter, media_info
        char *condition_query = NULL;
        char *option_query = NULL;
        sqlite3_stmt *stmt = NULL;
+#ifdef _USE_TVPD_MODE
        filter_s *_filter = (filter_s *)filter;
+#endif
 
        switch (group_type) {
        case MEDIA_GROUP_NONE:
@@ -1257,10 +1182,7 @@ int _media_db_get_group_item(const char *group_name, filter_h filter, media_info
                else
                        select_query = g_strdup_printf(SELECT_MEDIA_ITEM, DB_VIEW_MEDIA);
 #else
-               if (_filter && STRING_VALID(_filter->storage_id))
-                       select_query = g_strdup_printf(SELECT_MEDIA_ITEM_BY_STORAGE_ID, _filter->storage_id);
-               else
-                       select_query = g_strdup(SELECT_MEDIA_ITEM);
+               select_query = g_strdup(SELECT_MEDIA_ITEM);
 #endif
                break;
 
@@ -1275,14 +1197,6 @@ int _media_db_get_group_item(const char *group_name, filter_h filter, media_info
 #endif
                break;
 
-       case MEDIA_GROUP_STORAGE:
-#ifdef _USE_TVPD_MODE
-               select_query = g_strdup_printf(SELECT_MEDIA_FROM_STORAGE, group_name, group_name);
-#else
-               select_query = g_strdup_printf(SELECT_MEDIA_FROM_STORAGE, group_name);
-#endif
-               break;
-
        default:
                content_error("INVALID_PARAMETER");
                return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
@@ -1318,74 +1232,6 @@ int _media_db_get_group_item(const char *group_name, filter_h filter, media_info
        return ret;
 }
 
-#ifdef _USE_SENIOR_MODE
-int _media_db_get_group_item_by_union_select(const char *group_name, filter_h filter1, filter_h filter2, media_info_cb callback, void *user_data)
-{
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-       char select_query1[MAX_QUERY_SIZE] = {0, };
-       char *condition_query1 = NULL;
-       char *option_query1 = NULL;
-       char select_query2[MAX_QUERY_SIZE] = {0, };
-       char *condition_query2 = NULL;
-       char *option_query2 = NULL;
-       sqlite3_stmt *stmt = NULL;
-       filter_s *_filter1 = (filter_s *)filter1;
-       filter_s *_filter2 = (filter_s *)filter2;
-
-       if ((_filter1 != NULL) && STRING_VALID(_filter1->storage_id))
-               snprintf(select_query1, sizeof(select_query1), SELECT_MEDIA_FROM_FOLDER, _filter1->storage_id, group_name);
-       else
-               snprintf(select_query1, sizeof(select_query1), SELECT_MEDIA_FROM_FOLDER, DB_VIEW_MEDIA, group_name);
-
-       ret = __media_db_make_query(filter1, &condition_query1, &option_query1);
-       if (ret != MEDIA_CONTENT_ERROR_NONE) {
-               SAFE_FREE(condition_query1);
-               SAFE_FREE(option_query1);
-               content_error("create select_query1 failed");
-               return ret;
-       }
-
-       if ((_filter2 != NULL) && STRING_VALID(_filter2->storage_id))
-               snprintf(select_query2, sizeof(select_query2), SELECT_MEDIA_FROM_FOLDER, _filter2->storage_id, group_name);
-       else
-               snprintf(select_query2, sizeof(select_query2), SELECT_MEDIA_FROM_FOLDER, DB_VIEW_MEDIA, group_name);
-
-       ret = __media_db_make_query(filter2, &condition_query2, &option_query2);
-       if (ret != MEDIA_CONTENT_ERROR_NONE) {
-               SAFE_FREE(condition_query1);
-               SAFE_FREE(option_query1);
-               SAFE_FREE(condition_query2);
-               SAFE_FREE(option_query2);
-               content_error("create select_query2 failed");
-               return ret;
-       }
-
-       ret = _content_query_prepare_by_union_select(&stmt, select_query1, condition_query1, option_query1, select_query2, condition_query2, option_query2);
-       SAFE_FREE(condition_query1);
-       SAFE_FREE(option_query1);
-       SAFE_FREE(condition_query2);
-       SAFE_FREE(option_query2);
-       content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
-
-       while (sqlite3_step(stmt) == SQLITE_ROW) {
-               media_info_s *item = g_new0(media_info_s, 1);
-
-               _media_info_item_get_detail(stmt, (media_info_h)item);
-
-               if (callback((media_info_h)item, user_data) == false) {
-                       media_info_destroy((media_info_h)item);
-                       break;
-               }
-
-               media_info_destroy((media_info_h)item);
-       }
-
-       SQLITE3_FINALIZE(stmt);
-
-       return ret;
-}
-#endif
-
 int _media_db_get_media_group_item_count(const char *group_name, filter_h filter, media_group_e group, int *item_count)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
@@ -1394,9 +1240,8 @@ int _media_db_get_media_group_item_count(const char *group_name, filter_h filter
        char *tmp_option = NULL;
        char *condition_query = NULL;
        char *option_query = NULL;
-       filter_s *_filter = (filter_s *)filter;
-
 #ifdef _USE_TVPD_MODE
+       filter_s *_filter = (filter_s *)filter;
        if (group < MEDIA_PVR_GROUP_DURATION) { /*media content */
                if (group_name) {
                        if (_filter && STRING_VALID(_filter->storage_id))
@@ -1435,17 +1280,10 @@ int _media_db_get_media_group_item_count(const char *group_name, filter_h filter
                }
        }
 #else
-       if (group_name) {
-               if (_filter && 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
-                       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_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, __media_db_get_group_name(group));
-       }
+       if (group_name)
+               sqlite3_snprintf(MAX_QUERY_SIZE, select_query, SELECT_MEDIA_COUNT_FROM_GROUP, __media_db_get_group_name(group), group_name);
+       else
+               snprintf(select_query, MAX_QUERY_SIZE, SELECT_MEDIA_COUNT_FROM_GROUP_NULL, __media_db_get_group_name(group));
 #endif
        ret = __media_db_make_query(filter, &condition_query, &option_query);
        content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
@@ -1479,9 +1317,8 @@ int _media_db_get_media_group_item(const char *group_name, filter_h filter, medi
        char *condition_query = NULL;
        char *option_query = NULL;
        sqlite3_stmt *stmt = NULL;
-       filter_s *_filter = (filter_s *)filter;
-
 #ifdef _USE_TVPD_MODE
+       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);
@@ -1494,17 +1331,10 @@ int _media_db_get_media_group_item(const char *group_name, filter_h filter, medi
                        snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_GROUP_NULL, DB_VIEW_MEDIA, __media_db_get_group_name(group));
        }
 #else
-       if (group_name) {
-               if (_filter && STRING_VALID(_filter->storage_id))
-                       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 && 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);
-               else
-                       snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_GROUP_NULL, __media_db_get_group_name(group));
-       }
+       if (group_name)
+               sqlite3_snprintf(MAX_QUERY_SIZE, select_query, SELECT_MEDIA_FROM_GROUP, __media_db_get_group_name(group), group_name);
+       else
+               snprintf(select_query, MAX_QUERY_SIZE, SELECT_MEDIA_FROM_GROUP_NULL, __media_db_get_group_name(group));
 #endif
        ret = __media_db_make_query(filter, &condition_query, &option_query);
        content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
@@ -1532,41 +1362,7 @@ int _media_db_get_media_group_item(const char *group_name, filter_h filter, medi
        return ret;
 }
 
-int _media_db_get_storage(filter_h filter, media_storage_cb callback, void *user_data)
-{
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-       char *condition_query = NULL;
-       char *option_query = NULL;
-       sqlite3_stmt *stmt = NULL;
-
-       ret = __media_db_make_query(filter, &condition_query, &option_query);
-       content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
-
-       ret = _content_query_prepare(SELECT_STORAGE_LIST, condition_query, option_query, &stmt);
-       g_free(condition_query);
-       g_free(option_query);
-       content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
-
-       while (sqlite3_step(stmt) == SQLITE_ROW) {
-               media_storage_s *_storage = g_new0(media_storage_s, 1);
-
-               _storage->storage_id = g_strdup((const char *)sqlite3_column_text(stmt, 0));
-               _storage->storage_path = g_strdup((const char *)sqlite3_column_text(stmt, 1));
-               _storage->storage_type = sqlite3_column_int(stmt, 2);
-
-               if (callback((media_storage_h)_storage, user_data) == false) {
-                       media_storage_destroy((media_storage_h) _storage);
-                       break;
-               }
-
-               media_storage_destroy((media_storage_h) _storage);
-       }
-
-       SQLITE3_FINALIZE(stmt);
-
-       return ret;
-}
-
+#ifdef _USE_TVPD_MODE
 int _media_db_get_storage_id_by_media_id(const char *media_id, char **storage_id)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
@@ -1591,7 +1387,6 @@ int _media_db_get_storage_id_by_media_id(const char *media_id, char **storage_id
        return ret;
 }
 
-#ifdef _USE_TVPD_MODE
 int _media_db_get_pvr_group_item(const char *group_name, filter_h filter, media_group_e group, media_pvr_cb callback, void *user_data)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
@@ -1860,4 +1655,39 @@ int _media_db_get_uhd(filter_h filter, media_uhd_cb callback, void *user_data)
 
        return ret;
 }
+
+int _media_db_get_storage(filter_h filter, media_storage_cb callback, void *user_data)
+{
+       int ret = MEDIA_CONTENT_ERROR_NONE;
+       char *condition_query = NULL;
+       char *option_query = NULL;
+       sqlite3_stmt *stmt = NULL;
+
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
+       content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
+
+       ret = _content_query_prepare(SELECT_STORAGE_LIST, condition_query, option_query, &stmt);
+       g_free(condition_query);
+       g_free(option_query);
+       content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
+
+       while (sqlite3_step(stmt) == SQLITE_ROW) {
+               media_storage_s *_storage = g_new0(media_storage_s, 1);
+
+               _storage->storage_id = g_strdup((const char *)sqlite3_column_text(stmt, 0));
+               _storage->storage_path = g_strdup((const char *)sqlite3_column_text(stmt, 1));
+               _storage->storage_type = sqlite3_column_int(stmt, 2);
+
+               if (callback((media_storage_h)_storage, user_data) == false) {
+                       media_storage_destroy((media_storage_h) _storage);
+                       break;
+               }
+
+               media_storage_destroy((media_storage_h) _storage);
+       }
+
+       SQLITE3_FINALIZE(stmt);
+
+       return ret;
+}
 #endif