Integrate IPC related errors

[platform/core/api/media-content.git] / src / media_group.c

diff --git a/src/media_group.c b/src/media_group.c
index d8ec816..90350aa 100755 (executable)
--- a/src/media_group.c
+++ b/src/media_group.c
@@ -14,10 +14,8 @@
 * limitations under the License.
 */
 
-#include <media_filter.h>
-#include <media_info.h>
+
 #include <media_info_private.h>
-#include <media_group.h>
 
 
 int media_album_get_album_count_from_db(filter_h filter, int *album_count)
@@ -80,21 +78,19 @@ int media_album_get_album_from_db(int album_id, media_album_h *album)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
        sqlite3_stmt *stmt = NULL;
-       char select_query[DEFAULT_QUERY_SIZE];
+       char select_query[DEFAULT_QUERY_SIZE] = {0, };
 
-       if (album_id < 0) {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
+       media_content_retvm_if(album_id <= 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid album_id [%d]", album_id);
+       media_content_retvm_if(album == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid album");
 
        memset(select_query, 0x00, sizeof(select_query));
 
        snprintf(select_query, sizeof(select_query), SELECT_ALBUM_FROM_ALBUM, album_id);
 
-       ret = _content_query_prepare(&stmt, select_query, NULL, NULL);
+       ret = _content_get_result(select_query, &stmt);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
-       while (sqlite3_step(stmt) == SQLITE_ROW) {
+       if (sqlite3_step(stmt) == SQLITE_ROW) {
                media_album_s *_album = (media_album_s*)calloc(1, sizeof(media_album_s));
                if (_album == NULL) {
                        media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
@@ -102,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;
        }
@@ -145,8 +142,8 @@ int media_album_clone(media_album_h *dst, media_album_h src)
 
                _dst->album_id = _src->album_id;
 
-               if (STRING_VALID(_src->name)) {
-                       _dst->name = strdup(_src->name);
+               if (_src->name != NULL) {
+                       _dst->name = g_strdup(_src->name);
                        if (_dst->name == NULL) {
                                media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                media_album_destroy((media_album_h)_dst);
@@ -154,8 +151,8 @@ int media_album_clone(media_album_h *dst, media_album_h src)
                        }
                }
 
-               if (STRING_VALID(_src->artist)) {
-                       _dst->artist = strdup(_src->artist);
+               if (_src->artist != NULL) {
+                       _dst->artist = g_strdup(_src->artist);
                        if (_dst->artist == NULL) {
                                media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                media_album_destroy((media_album_h)_dst);
@@ -163,8 +160,8 @@ int media_album_clone(media_album_h *dst, media_album_h src)
                        }
                }
 
-               if (STRING_VALID(_src->album_art_path)) {
-                       _dst->album_art_path = strdup(_src->album_art_path);
+               if (_src->album_art_path != NULL) {
+                       _dst->album_art_path = g_strdup(_src->album_art_path);
                        if (_dst->album_art_path == NULL) {
                                media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
                                media_album_destroy((media_album_h)_dst);
@@ -205,8 +202,8 @@ int media_album_get_name(media_album_h album, char **name)
        media_album_s *_album = (media_album_s*)album;
 
        if (_album) {
-               if (STRING_VALID(_album->name)) {
-                       *name = strdup(_album->name);
+               if (_album->name != NULL) {
+                       *name = g_strdup(_album->name);
                        media_content_retvm_if(*name == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                } else {
                        *name = NULL;
@@ -227,8 +224,8 @@ int media_album_get_artist(media_album_h album, char **artist)
        media_album_s *_album = (media_album_s*)album;
 
        if (_album) {
-               if (STRING_VALID(_album->artist)) {
-                       *artist = strdup(_album->artist);
+               if (_album->artist != NULL) {
+                       *artist = g_strdup(_album->artist);
                        media_content_retvm_if(*artist == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                } else {
                        *artist = NULL;
@@ -249,8 +246,8 @@ int media_album_get_album_art(media_album_h album, char **album_art)
        media_album_s *_album = (media_album_s*)album;
 
        if (_album) {
-               if (STRING_VALID(_album->album_art_path)) {
-                       *album_art = strdup(_album->album_art_path);
+               if (_album->album_art_path != NULL) {
+                       *album_art = g_strdup(_album->album_art_path);
                        media_content_retvm_if(*album_art == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                } else {
                        *album_art = NULL;
@@ -268,8 +265,11 @@ int media_album_get_album_art(media_album_h album, char **album_art)
 int media_group_get_group_count_from_db(filter_h filter, media_group_e group, int *group_count)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
-
+#ifdef _USE_TVPD_MODE
+       if ((group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_GROUP_MAX) || (group_count == NULL)) {
+#else
        if ((group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_CONTENT_GROUP_MAX) || (group_count == NULL)) {
+#endif
                media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
                ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        } else {
@@ -278,12 +278,30 @@ int media_group_get_group_count_from_db(filter_h filter, media_group_e group, in
 
        return ret;
 }
+#ifdef _USE_TVPD_MODE
+int media_group_foreach_group_and_count_from_db(filter_h filter, media_group_e group, media_group_and_count_cb callback, void *user_data)
+{
+       int ret = MEDIA_CONTENT_ERROR_NONE;
+
+       if ((callback == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_GROUP_MAX)) {
+               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+               ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
+       } else {
+               ret = _media_db_get_media_group_and_count(group, filter, callback, user_data);
+       }
+
+       return ret;
+}
+#endif
 
 int media_group_foreach_group_from_db(filter_h filter, media_group_e group, media_group_cb callback, void *user_data)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
-
+#ifdef _USE_TVPD_MODE
+       if ((callback == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_GROUP_MAX)) {
+#else
        if ((callback == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_CONTENT_GROUP_MAX)) {
+#endif
                media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
                ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        } else {
@@ -296,8 +314,11 @@ int media_group_foreach_group_from_db(filter_h filter, media_group_e group, medi
 int media_group_get_media_count_from_db(const char *group_name, media_group_e group, filter_h filter, int *media_count)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
-
+#ifdef _USE_TVPD_MODE
+       if ((media_count == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_GROUP_MAX)) {
+#else
        if ((media_count == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_CONTENT_GROUP_MAX)) {
+#endif
                media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
                ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        } else {
@@ -310,8 +331,11 @@ int media_group_get_media_count_from_db(const char *group_name, media_group_e gr
 int media_group_foreach_media_from_db(const char *group_name, media_group_e group, filter_h filter, media_info_cb callback, void *user_data)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
-
+#ifdef _USE_TVPD_MODE
+       if ((callback == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_GROUP_MAX)) {
+#else
        if ((callback == NULL) || (group < MEDIA_CONTENT_GROUP_DISPLAY_NAME) || (group >= MEDIA_CONTENT_GROUP_MAX)) {
+#endif
                media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
                ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        } else {