Change DB field name to orientation from media_orientation
[platform/core/api/media-content.git] / include / media_info_private.h
old mode 100755 (executable)
new mode 100644 (file)
index fd12faa..af8cb86
@@ -50,13 +50,13 @@ extern "C" {
 * @brief This file contains the media info API and related structure and enumeration. \n
 *        Description of the audio, video,image content involves: album, artist, album_artist, genre and description tags. \n
 *        Parameters of the recording are also supported, as: format, bitrate, duration, size etc. \n
-*        Defenitions of media DB fields and tables, operations with media data relating to DB and handling with media filter attributes.
+*        Definitions of media DB fields and tables, operations with media data relating to DB and handling with media filter attributes.
 */
 
 
 #define LOG_TAG "CAPI_CONTENT_MEDIA_CONTENT"
 
-#define SAFE_STRLCPY(dst, src, n)      ((g_strlcpy(dst, src, n) < n) ? TRUE : FALSE)
+#define SAFE_STRLCPY(dst, src, n)      g_strlcpy(dst, src, n);
 #define SAFE_STRLCAT(dst, src, n)      g_strlcat(dst, src, n);
 #define SAFE_FREE(src)         {if (src) {free(src); src = NULL; } }
 #define STRING_VALID(str)              ((str != NULL && strlen(str) > 0) ? TRUE : FALSE)
@@ -69,9 +69,9 @@ extern "C" {
 #define MAX_QUERY_SIZE 4096
 #define MAX_PATH_LEN 4096
 #define DEFAULT_QUERY_SIZE 1024
-#define COLLATE_STR_SIZE 32
 #define MEDIA_CONTENT_UUID_SIZE        36
 #define BATCH_REQUEST_MAX 300
+#define BATCH_REQUEST_FILE_LEN 255
 
 typedef enum {
        MEDIA_INFO_UUID = 0,
@@ -87,7 +87,6 @@ typedef enum {
        MEDIA_INFO_RATING,
        MEDIA_INFO_FAVOURITE,
        MEDIA_INFO_IS_DRM,
-       MEDIA_INFO_STORAGE_TYPE,
        MEDIA_INFO_LONGITUDE,
        MEDIA_INFO_LATITUDE,
        MEDIA_INFO_ALTITUDE,
@@ -115,7 +114,6 @@ typedef enum {
        MEDIA_INFO_SAMPLERATE,
        MEDIA_INFO_CHANNEL,
        MEDIA_INFO_TIMELINE,
-       MEDIA_INFO_SYNC_STATUS,
        MEDIA_INFO_STORAGE_UUID,
        MEDIA_INFO_IS_360,
        MEDIA_INFO_ITEM_MAX,
@@ -144,7 +142,6 @@ typedef enum {
        MEDIA_GROUP_BOOKMARK,
        MEDIA_GROUP_TAG_BY_MEDIA_ID,
        MEDIA_GROUP_BOOKMARK_BY_MEDIA_ID,
-       MEDIA_GROUP_STORAGE,
        MEDIA_GROUP_FACE,
        MEDIA_GROUP_FACE_BY_MEDIA_ID,
 } group_list_e;
@@ -166,7 +163,6 @@ typedef struct {
        char *folder_id;
        char *path;
        char *name;
-       media_content_storage_e storage_type;
        char *storage_uuid;
 } media_folder_s;
 
@@ -248,6 +244,14 @@ typedef struct {
 
 typedef struct {
        char *media_id;
+       char *author;
+       char *publisher;
+       char *date;
+       char *subject;
+} book_meta_s;
+
+typedef struct {
+       char *media_id;
        char *file_path;
        char *display_name;
        media_content_type_e media_type;
@@ -265,15 +269,14 @@ typedef struct {
        time_t favourite;
        char *title;
        int is_drm;
-       int storage_type;
        char *storage_uuid;
-       int sync_status;
        unsigned int request_id;
        unsigned int face_request_id;
        int is_360;
        image_meta_s *image_meta;
        video_meta_s *video_meta;
        audio_meta_s *audio_meta;
+       book_meta_s *book_meta;
 } media_info_s;
 
 typedef struct {
@@ -292,12 +295,6 @@ typedef struct {
 } media_playlist_item_s;
 
 typedef struct {
-       char *storage_id;
-       char *storage_path;
-       int storage_type;
-} media_storage_s;
-
-typedef struct {
        int face_id;                            /* face id */
        char *media_id;                 /* media uuid */
        unsigned int face_rect_x;       /* x position of face */
@@ -309,17 +306,6 @@ typedef struct {
 } media_face_s;
 
 typedef struct {
-       media_info_s *handle;
-       void *user_data;
-       media_thumbnail_completed_cb thumbnail_completed_cb;
-} media_thumbnail_cb_s;
-
-typedef struct {
-       void *user_data;
-       media_face_detection_completed_cb face_completed_cb;
-} media_face_cb_s;
-
-typedef struct {
        media_insert_completed_cb insert_completed_cb;
        char *insert_list_path;
        void *user_data;
@@ -345,7 +331,6 @@ typedef struct _media_content_cb_data {
 #define DB_TABLE_PLAYLIST              "playlist"
 #define DB_TABLE_PLAYLIST_MAP  "playlist_map"
 #define DB_TABLE_BOOKMARK              "bookmark"
-#define DB_TABLE_STORAGE               "storage"
 #define DB_TABLE_FACE                  "face"
 #define DB_TABLE_FACE_SCAN_LIST        "face_scan_list"
 
@@ -376,17 +361,6 @@ typedef struct _media_content_cb_data {
 #define DB_FIELD_MEDIA_LATITUDE                "media_latitude"
 #define DB_FIELD_MEDIA_ALTITUDE                "media_altitude"
 
-/* DB Query Keyword */
-#define QUERY_KEYWORD_AND "AND"
-#define QUERY_KEYWORD_OR "OR"
-#define QUERY_KEYWORD_ORDER_BY "ORDER BY "
-#define QUERY_KEYWORD_LIMIT "limit"
-#define QUERY_KEYWORD_DESC "DESC"
-#define QUERY_KEYWORD_SPACE " "
-#define QUERY_KEYWORD_OPEN_BRACKET "("
-#define QUERY_KEYWORD_BRACKET ")"
-#define QUERY_KEYWORD_COLLATE " COLLATE "
-
 /* DB TABLE JOIN */
 #define FOLDER_MEDIA_JOIN              DB_TABLE_FOLDER" NATURAL LEFT OUTER JOIN "DB_TABLE_MEDIA" WHERE validity IN (1, 2) "
 #define BOOKMARK_MEDIA_JOIN            DB_TABLE_BOOKMARK" NATURAL JOIN "DB_TABLE_MEDIA" WHERE validity IN (1, 2) "
@@ -394,136 +368,102 @@ typedef struct _media_content_cb_data {
 #define FACE_MEDIA_JOIN                        DB_TABLE_FACE" NATURAL JOIN "DB_TABLE_MEDIA" WHERE validity IN (1, 2) "
 
 /* Get Group List */
-#define SELECT_ALBUM_LIST                      "SELECT DISTINCT album_id, name, artist, album_art FROM "ALBUM_MEDIA_JOIN
-#define SELECT_ALBUM_LIST_BY_STORAGE_ID                SELECT_ALBUM_LIST"AND storage_uuid='%s' "
+#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 "DB_TABLE_MEDIA" WHERE validity IN (1, 2) "
-#define SELECT_MEDIA_GROUP_LIST_BY_STORAGE_ID  SELECT_MEDIA_GROUP_LIST"AND storage_uuid='%s' "
-
-#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 "
+#define SELECT_FOLDER_LIST     "SELECT DISTINCT folder_id, folder_path, folder_name, storage_uuid FROM "FOLDER_MEDIA_JOIN
+#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_ALBUM_COUNT_BY_STORAGE_ID               SELECT_ALBUM_COUNT"AND storage_uuid='%s' "
-#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 "
+#define SELECT_ALBUM_COUNT     "SELECT COUNT(DISTINCT album_id) FROM "ALBUM_MEDIA_JOIN
+#define SELECT_FOLDER_COUNT    "SELECT COUNT(DISTINCT folder_id) FROM "FOLDER_MEDIA_JOIN
+#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 "
 #define SELECT_BOOKMARK_COUNT  "SELECT COUNT(*) FROM "BOOKMARK_MEDIA_JOIN
-#define SELECT_BOOKMARK_COUNT_BY_STORAGE_ID    SELECT_BOOKMARK_COUNT"AND storage_uuid='%s' "
-#define SELECT_MEDIA_GROUP_COUNT       "SELECT COUNT(*) FROM ("SELECT_MEDIA_GROUP_LIST
-#define SELECT_MEDIA_GROUP_COUNT_BY_STORAGE_ID SELECT_MEDIA_GROUP_COUNT"AND storage_uuid='%s' "
-/*count(distinct x) count only non-null values, but select distinct X returns include null. so sync the result of count and list, don't use count(distinct x)*/
+#define SELECT_MEDIA_GROUP_COUNT       "SELECT COUNT(DISTINCT %s) + COUNT(DISTINCT CASE WHEN %s IS NULL THEN 1 END) AS COUNT FROM "DB_TABLE_MEDIA" WHERE validity IN (1, 2) "
 
 /* Get Media Count of Group */
-#define SELECT_MEDIA_COUNT_FROM_MEDIA                  "SELECT COUNT(*) FROM ("SELECT_MEDIA_ITEM               /*to apply limit condition. "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE validity=1" */
+#define SELECT_MEDIA_COUNT_FROM_MEDIA  "SELECT COUNT(*) FROM (SELECT media_id FROM "DB_TABLE_MEDIA" WHERE validity IN (1, 2) "
 #define SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE   "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE validity IN (1, 2) "
-#define SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE_BY_STORAGE_ID     SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE"AND storage_uuid='%s' "
-#define SELECT_MEDIA_COUNT_FROM_ALBUM                  "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE validity IN (1, 2) AND album_id='%d' "
-#define SELECT_MEDIA_COUNT_FROM_ALBUM_BY_STORAGE_ID            SELECT_MEDIA_COUNT_FROM_ALBUM"AND storage_uuid='%s' "
-#define SELECT_MEDIA_COUNT_FROM_GROUP                  "SELECT COUNT(*) FROM ("SELECT_MEDIA_FROM_GROUP         /*to apply limit condition. */
-#define SELECT_MEDIA_COUNT_FROM_GROUP_BY_STORAGE_ID                    "SELECT COUNT(*) FROM ("SELECT_MEDIA_FROM_GROUP_BY_STORAGE_ID   /*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_GROUP_NULL_BY_STORAGE_ID       "SELECT COUNT(*) FROM ("SELECT_MEDIA_FROM_GROUP_NULL_BY_STORAGE_ID      /* to apply limit condition. */
-#define SELECT_MEDIA_COUNT_FROM_FOLDER                 "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE validity IN (1, 2) AND folder_id='%q'"
-#define SELECT_MEDIA_COUNT_FROM_FOLDER_BY_STORAGE_ID           SELECT_MEDIA_COUNT_FROM_FOLDER" AND storage_uuid='%s' "
-#define SELECT_MEDIA_COUNT_FROM_STORAGE                        "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE validity IN (1, 2) 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) "
+#define SELECT_MEDIA_COUNT_FROM_ALBUM  "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE validity IN (1, 2) AND album_id='%d' "
+#define SELECT_MEDIA_COUNT_FROM_GROUP  "SELECT COUNT(*) FROM ("SELECT_MEDIA_FROM_GROUP
+#define SELECT_MEDIA_COUNT_FROM_GROUP_NULL     "SELECT COUNT(*) FROM ("SELECT_MEDIA_FROM_GROUP_NULL
+#define SELECT_MEDIA_COUNT_FROM_FOLDER "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE validity IN (1, 2) AND folder_id='%s'"
+#define SELECT_MEDIA_COUNT_FROM_STORAGE        "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE validity IN (1, 2) AND storage_uuid='%s'"
+#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_path, folder_name, folder_storage_type, storage_uuid FROM "DB_TABLE_FOLDER" WHERE folder_id='%s'"
+#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_path, folder_name, 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'"
+#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'"
 
 /* Tag info*/
-#define INSERT_TAG_TO_TAG                                              "INSERT INTO "DB_TABLE_TAG" (tag_name) VALUES (%Q)"
-#define REMOVE_TAG_ITEM_FROM_TAG_MAP           "DELETE FROM "DB_TABLE_TAG_MAP" WHERE tag_id=%d AND media_id='%q';"
-#define UPDATE_TAG_NAME_FROM_TAG                       "UPDATE "DB_TABLE_TAG" SET tag_name='%q' WHERE tag_id=%d;"
-#define SELECT_TAG_COUNT_BY_MEDIA_ID                   "SELECT COUNT(*) FROM "DB_VIEW_TAG" WHERE media_id = '%s'"
-#define SELECT_TAG_LIST_BY_MEDIA_ID                            "SELECT tag_id, tag_name FROM "DB_VIEW_TAG" WHERE media_id = '%s'"
+#define INSERT_TAG_TO_TAG      "INSERT INTO "DB_TABLE_TAG" (tag_name) VALUES (%Q)"
+#define REMOVE_TAG_ITEM_FROM_TAG_MAP   "DELETE FROM "DB_TABLE_TAG_MAP" WHERE tag_id=%d AND media_id='%q';"
+#define UPDATE_TAG_NAME_FROM_TAG       "UPDATE "DB_TABLE_TAG" SET tag_name='%q' WHERE tag_id=%d;"
+#define SELECT_TAG_COUNT_BY_MEDIA_ID   "SELECT COUNT(*) FROM "DB_VIEW_TAG" WHERE media_id = '%s'"
+#define SELECT_TAG_LIST_BY_MEDIA_ID    "SELECT tag_id, tag_name FROM "DB_VIEW_TAG" WHERE media_id = '%s' "
 
 /* Get Media list of Group */
 #define MEDIA_INFO_ITEM "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, media_thumbnail_path, media_description, \
-                                                       media_rating, media_favourite, media_is_drm, media_storage_type, media_longitude, media_latitude, media_altitude, exposure_time, fnumber, iso, \
-                                                       model, media_width, media_height, media_datetaken, media_orientation, media_title, media_album, media_artist, media_album_artist, media_genre, \
+                                                       media_rating, media_favourite, media_is_drm, media_longitude, media_latitude, media_altitude, exposure_time, fnumber, iso, \
+                                                       model, media_width, media_height, media_datetaken, orientation, media_title, media_album, media_artist, media_album_artist, media_genre, \
                                                        media_composer, media_year, media_recorded_date, media_copyright, media_track_num, media_bitrate, media_bitpersample, media_duration, media_samplerate, media_channel, \
-                                                       media_timeline, sync_status, storage_uuid, media_360"
+                                                       media_timeline, storage_uuid, media_360"
 
 /* Playlist Info */
-#define INSERT_PLAYLIST_TO_PLAYLIST                                            "INSERT INTO "DB_TABLE_PLAYLIST" (playlist_name) VALUES (%Q)"
-#define UPDATE_PLAYLIST_NAME_FROM_PLAYLIST                     "UPDATE "DB_TABLE_PLAYLIST" SET playlist_name='%q' WHERE playlist_id=%d;"
-#define UPDATE_PLAYLIST_THUMBNAIL_FROM_PLAYLIST                "UPDATE "DB_TABLE_PLAYLIST" SET thumbnail_path='%q' WHERE playlist_id=%d;"
-#define SELECT_PLAYLIST_ID_FROM_PLAYLIST                               "SELECT playlist_id FROM "DB_TABLE_PLAYLIST" WHERE playlist_name='%q'"
+#define INSERT_PLAYLIST_TO_PLAYLIST    "INSERT INTO "DB_TABLE_PLAYLIST" (playlist_name) VALUES (%Q)"
+#define UPDATE_PLAYLIST_NAME_FROM_PLAYLIST     "UPDATE "DB_TABLE_PLAYLIST" SET playlist_name='%q' WHERE playlist_id=%d;"
+#define UPDATE_PLAYLIST_THUMBNAIL_FROM_PLAYLIST        "UPDATE "DB_TABLE_PLAYLIST" SET thumbnail_path='%q' WHERE playlist_id=%d;"
+#define SELECT_PLAYLIST_ID_FROM_PLAYLIST       "SELECT playlist_id FROM "DB_TABLE_PLAYLIST" WHERE playlist_name='%q'"
 #define SELECT_PLAYLIST_ITEM_ALL_FROM_PLAYLIST_VIEW    "SELECT "MEDIA_INFO_ITEM", pm_id FROM "DB_VIEW_PLAYLIST" WHERE (playlist_id=%d and playlist_media_count>0) "
-#define SELECT_PLAY_ORDER_FROM_PLAYLIST_VIEW                   "SELECT playlist_member_order FROM "DB_VIEW_PLAYLIST" WHERE playlist_id=%d and pm_id=%d"
+#define SELECT_PLAY_ORDER_FROM_PLAYLIST_VIEW   "SELECT playlist_member_order FROM "DB_VIEW_PLAYLIST" WHERE playlist_id=%d and pm_id=%d"
 #define SELECT_MAX_PLAY_ORDER_FROM_PLAYLIST_VIEW       "SELECT MAX(playlist_member_order) FROM "DB_VIEW_PLAYLIST" WHERE playlist_id=%d"
-#define REMOVE_PLAYLIST_ITEM_FROM_PLAYLIST_MAP         "DELETE FROM "DB_TABLE_PLAYLIST_MAP" WHERE playlist_id=%d AND _id=%d;"
-#define UPDATE_PLAYLIST_ORDER_FROM_PLAYLIST_MAP                "UPDATE "DB_TABLE_PLAYLIST_MAP" SET playlist_member_order=%d WHERE playlist_id=%d AND _id=%d;"
-#define INSERT_PLAYLIST_ITEM_TO_PLAYLIST_MAP           "INSERT INTO "DB_TABLE_PLAYLIST_MAP" (playlist_id, media_id, playlist_member_order) VALUES (%d, '%q', %d);"
+#define REMOVE_PLAYLIST_ITEM_FROM_PLAYLIST_MAP "DELETE FROM "DB_TABLE_PLAYLIST_MAP" WHERE playlist_id=%d AND _id=%d;"
+#define UPDATE_PLAYLIST_ORDER_FROM_PLAYLIST_MAP        "UPDATE "DB_TABLE_PLAYLIST_MAP" SET playlist_member_order=%d WHERE playlist_id=%d AND _id=%d;"
+#define INSERT_PLAYLIST_ITEM_TO_PLAYLIST_MAP   "INSERT INTO "DB_TABLE_PLAYLIST_MAP" (playlist_id, media_id, playlist_member_order) VALUES (%d, '%q', %d);"
 
 /* Bookmark */
-#define INSERT_BOOKMARK_TO_BOOKMARK                    "INSERT INTO "DB_TABLE_BOOKMARK" (media_id, bookmark_marked_time, bookmark_thumbnail_path, bookmark_name) VALUES ('%q', '%d', %Q, %Q)"
-#define SELECT_BOOKMARK_COUNT_BY_MEDIA_ID              "SELECT COUNT(*) FROM "BOOKMARK_MEDIA_JOIN" AND media_id='%s'"
-#define SELECT_BOOKMARK_LIST                                           "SELECT bookmark_id, media_id, bookmark_marked_time, bookmark_thumbnail_path, bookmark_name FROM "BOOKMARK_MEDIA_JOIN
-#define SELECT_BOOKMARK_LIST_BY_STORAGE_ID                     SELECT_BOOKMARK_LIST"AND storage_uuid='%s' "
-#define SELECT_BOOKMARK_LIST_BY_MEDIA_ID                       "SELECT bookmark_id, media_id, bookmark_marked_time, bookmark_thumbnail_path, bookmark_name FROM "BOOKMARK_MEDIA_JOIN" AND media_id='%s'"
-#define SELECT_BOOKMARK_ID_FROM_BOOKMARK               "SELECT bookmark_id FROM "DB_TABLE_BOOKMARK" WHERE media_id='%s' AND bookmark_marked_time=%d"
-
-#define UPDATE_BOOKMARK_FROM_BOOKMARK          "UPDATE "DB_TABLE_BOOKMARK" SET bookmark_name=%Q WHERE bookmark_id=%d;"
-
-/* Update Meta*/
-#define UPDATE_IMAGE_META_FROM_MEDIA   "UPDATE "DB_TABLE_MEDIA" SET media_orientation=%d WHERE media_id='%q'"
-
-#define SELECT_MEDIA_ITEM                                      "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity IN (1, 2) "
-#define SELECT_MEDIA_ITEM_BY_STORAGE_ID                SELECT_MEDIA_ITEM"AND storage_uuid='%s' "
-#define SELECT_MEDIA_FROM_MEDIA                        "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity IN (1, 2) AND media_id='%s'"
-#define SELECT_MEDIA_BY_PATH                           "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity=1 AND media_path='%q'"
-#define SELECT_MEDIA_FROM_ALBUM                        "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity IN (1, 2) AND album_id=%d"
-#define SELECT_MEDIA_FROM_ALBUM_BY_STORAGE_ID                  SELECT_MEDIA_FROM_ALBUM" AND storage_uuid='%s' "
-#define SELECT_MEDIA_FROM_GROUP                        "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity IN (1, 2) AND %s='%q'"
-#define SELECT_MEDIA_FROM_GROUP_BY_STORAGE_ID                  SELECT_MEDIA_FROM_GROUP" AND storage_uuid='%s' "
+#define INSERT_BOOKMARK_TO_BOOKMARK    "INSERT INTO "DB_TABLE_BOOKMARK" (media_id, bookmark_marked_time, bookmark_thumbnail_path, bookmark_name) VALUES ('%q', '%d', %Q, %Q)"
+#define SELECT_BOOKMARK_COUNT_BY_MEDIA_ID      "SELECT COUNT(*) FROM "BOOKMARK_MEDIA_JOIN" AND media_id='%s'"
+#define SELECT_BOOKMARK_LIST   "SELECT bookmark_id, media_id, bookmark_marked_time, bookmark_thumbnail_path, bookmark_name FROM "BOOKMARK_MEDIA_JOIN
+#define SELECT_BOOKMARK_LIST_BY_MEDIA_ID       "SELECT bookmark_id, media_id, bookmark_marked_time, bookmark_thumbnail_path, bookmark_name FROM "BOOKMARK_MEDIA_JOIN" AND media_id='%s'"
+#define SELECT_BOOKMARK_ID_FROM_BOOKMARK       "SELECT bookmark_id FROM "DB_TABLE_BOOKMARK" WHERE media_id='%s' AND bookmark_marked_time=%d"
+
+#define UPDATE_BOOKMARK_FROM_BOOKMARK  "UPDATE "DB_TABLE_BOOKMARK" SET bookmark_name=%Q WHERE bookmark_id=%d;"
+
+#define SELECT_MEDIA_ITEM      "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity IN (1, 2) "
+#define SELECT_MEDIA_FROM_MEDIA        "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity IN (1, 2) AND media_id='%s'"
+#define SELECT_MEDIA_BY_PATH   "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity=1 AND media_path='%q'"
+#define SELECT_MEDIA_FROM_ALBUM        "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity IN (1, 2) AND album_id=%d"
+#define SELECT_MEDIA_FROM_GROUP        "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity IN (1, 2) AND %s='%q'"
 #define SELECT_MEDIA_FROM_GROUP_NULL   "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity IN (1, 2) AND %s IS NULL"
-#define SELECT_MEDIA_FROM_GROUP_NULL_BY_STORAGE_ID     SELECT_MEDIA_FROM_GROUP_NULL" AND storage_uuid='%s' "
-#define SELECT_MEDIA_FROM_FOLDER                       "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity IN (1, 2) AND folder_id='%s'"
-#define SELECT_MEDIA_FROM_STORAGE              "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity IN (1, 2) AND storage_uuid='%s'"
-#define SELECT_MEDIA_FROM_TAG                  "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE media_id IN (SELECT media_id FROM "DB_TABLE_TAG_MAP" WHERE tag_id=%d) AND validity IN (1, 2)"
-#define SELECT_MEDIA_FROM_PLAYLIST             "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE media_id IN (SELECT media_id FROM "DB_TABLE_PLAYLIST_MAP" WHERE playlist_id=%d) AND validity IN (1, 2)"
-#define SELECT_MEDIA_FROM_TAG_BY_STORAGE_ID                    SELECT_MEDIA_FROM_TAG" AND storage_uuid='%s' "
-#define SELECT_MEDIA_FROM_PLAYLIST_BY_STORAGE_ID       SELECT_MEDIA_FROM_PLAYLIST" AND storage_uuid='%s' "
-#define SELECT_MEDIA_PATH_BY_ID                        "SELECT media_path FROM "DB_TABLE_MEDIA" WHERE media_id='%q'"
-#define SELECT_MEDIA_STORAGE_ID_BY_ID          "SELECT storage_uuid FROM "DB_TABLE_MEDIA" WHERE media_id='%q'"
+#define SELECT_MEDIA_FROM_FOLDER       "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE validity IN (1, 2) AND folder_id='%s'"
+#define SELECT_MEDIA_FROM_TAG  "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE media_id IN (SELECT media_id FROM "DB_TABLE_TAG_MAP" WHERE tag_id=%d) AND validity IN (1, 2)"
+#define SELECT_MEDIA_FROM_PLAYLIST     "SELECT "MEDIA_INFO_ITEM" FROM "DB_TABLE_MEDIA" WHERE media_id IN (SELECT media_id FROM "DB_TABLE_PLAYLIST_MAP" WHERE playlist_id=%d) AND validity IN (1, 2)"
 
 /* Delete */
-#define DELETE_PLAYLIST_FROM_PLAYLIST          "DELETE FROM "DB_TABLE_PLAYLIST" WHERE playlist_id=%d"
-#define DELETE_TAG_FROM_TAG                            "DELETE FROM "DB_TABLE_TAG" WHERE tag_id=%d"
+#define DELETE_PLAYLIST_FROM_PLAYLIST  "DELETE FROM "DB_TABLE_PLAYLIST" WHERE playlist_id=%d"
+#define DELETE_TAG_FROM_TAG    "DELETE FROM "DB_TABLE_TAG" WHERE tag_id=%d"
 #define DELETE_BOOKMARK_FROM_BOOKMARK  "DELETE FROM "DB_TABLE_BOOKMARK" WHERE bookmark_id=%d"
 
-/* Storage*/
-#define SELECT_STORAGE_COUNT                           "SELECT COUNT(*) FROM "DB_TABLE_STORAGE" WHERE validity=1"
-#define SELECT_STORAGE_LIST                                    "SELECT storage_id, storage_path, storage_type FROM "DB_TABLE_STORAGE" WHERE validity=1"
-#define SELECT_STORAGE_INFO_FROM_STORAGE       "SELECT storage_path, storage_type FROM "DB_TABLE_STORAGE" WHERE validity=1 AND storage_id='%s'"
-
 /* Face */
-#define DELETE_FACE_FROM_FACE                  "DELETE FROM "DB_TABLE_FACE" WHERE media_face_id=%d"
-#define INSERT_FACE_TO_FACE                            "INSERT INTO "DB_TABLE_FACE" (media_id, face_rect_x , face_rect_y, face_rect_w, face_rect_h, face_orientation, media_face_tag) VALUES ('%q', %d, %d, %d, %d, %d, %Q);"
-#define UPDATE_FACE_TO_FACE                    "UPDATE "DB_TABLE_FACE" SET face_rect_x=%d, face_rect_y=%d, face_rect_w=%d, face_rect_h=%d, face_orientation=%d, media_face_tag=%Q WHERE media_face_id=%d"
-#define SELECT_MEDIA_COUNT_FROM_MEDIA_BY_ID            "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE media_id='%q' AND validity IN (1, 2)"
-#define SELECT_IMAGE_COUNT_FROM_MEDIA_BY_ID            "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE media_id='%q' AND media_type=0 AND validity IN (1, 2)"
-#define SELECT_FACE_COUNT                                      "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN
-#define SELECT_FACE_COUNT_BY_STORAGE_ID                        SELECT_FACE_COUNT"AND storage_uuid='%s' "
-#define SELECT_FACE_COUNT_BY_MEDIA_ID          "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN" AND media_id='%s'"
-#define SELECT_FACE_LIST                                       "SELECT media_face_id, media_id, face_rect_x, face_rect_y, face_rect_w, face_rect_h, face_orientation, media_face_tag FROM "FACE_MEDIA_JOIN
-#define SELECT_FACE_LIST_BY_STORAGE_ID         SELECT_FACE_LIST"AND storage_uuid='%s' "
-#define SELECT_FACE_LIST_BY_MEDIA_ID           "SELECT media_face_id, media_id, face_rect_x, face_rect_y, face_rect_w, face_rect_h, face_orientation, media_face_tag FROM "FACE_MEDIA_JOIN" AND media_id='%s'"
+#define DELETE_FACE_FROM_FACE  "DELETE FROM "DB_TABLE_FACE" WHERE media_face_id=%d"
+#define INSERT_FACE_TO_FACE    "INSERT INTO "DB_TABLE_FACE" (media_id, face_rect_x , face_rect_y, face_rect_w, face_rect_h, face_orientation, media_face_tag) VALUES ('%q', %d, %d, %d, %d, %d, %Q);"
+#define UPDATE_FACE_TO_FACE    "UPDATE "DB_TABLE_FACE" SET face_rect_x=%d, face_rect_y=%d, face_rect_w=%d, face_rect_h=%d, face_orientation=%d, media_face_tag=%Q WHERE media_face_id=%d"
+#define SELECT_MEDIA_COUNT_FROM_MEDIA_BY_ID    "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE media_id='%q' AND validity IN (1, 2)"
+#define SELECT_IMAGE_COUNT_FROM_MEDIA_BY_ID    "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE media_id='%q' AND media_type=0 AND validity IN (1, 2)"
+#define SELECT_FACE_COUNT      "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN
+#define SELECT_FACE_COUNT_BY_MEDIA_ID  "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN" AND media_id='%s'"
+#define SELECT_FACE_LIST       "SELECT media_face_id, media_id, face_rect_x, face_rect_y, face_rect_w, face_rect_h, face_orientation, media_face_tag FROM "FACE_MEDIA_JOIN
+#define SELECT_FACE_LIST_BY_MEDIA_ID   "SELECT media_face_id, media_id, face_rect_x, face_rect_y, face_rect_w, face_rect_h, face_orientation, media_face_tag FROM "FACE_MEDIA_JOIN" AND media_id='%s'"
 #define UPDATE_MEDIA_INFO_IN_FACE_SCAN_LIST    "UPDATE "DB_TABLE_FACE_SCAN_LIST" SET modified_time = 0 WHERE media_id IN (SELECT media_id FROM "DB_TABLE_FACE" WHERE media_face_id=%d)"
-#define SELECT_FACE_ID                 "SELECT media_face_id FROM "DB_TABLE_FACE" WHERE media_id='%q' AND face_rect_x=%d AND face_rect_y=%d AND face_rect_w=%d AND face_rect_h=%d AND face_orientation=%d"
+#define SELECT_FACE_ID "SELECT media_face_id FROM "DB_TABLE_FACE" WHERE media_id='%q' AND face_rect_x=%d AND face_rect_y=%d AND face_rect_w=%d AND face_rect_h=%d AND face_orientation=%d"
 
-int _content_query_prepare(char *select_query, char *condition_query, char *option_query, sqlite3_stmt **stmt);
+int _content_query_prepare(const char *select_query, const char *condition_query, const char *option_query, sqlite3_stmt **stmt);
 int _content_get_result(char *query, sqlite3_stmt **stmt);
 int _content_error_capi(int internal_error);
 int _content_query_sql(char *query_str);
@@ -547,12 +487,9 @@ int _media_db_get_group_item_by_id(int group_id, filter_h filter, media_info_cb
 int _media_db_get_group_item(const char *group_name, filter_h filter, media_info_cb callback, void *user_data, group_list_e group_type);
 int _media_db_get_media_group_item_count(const char *group_name, filter_h filter, media_group_e group, int *item_count);
 int _media_db_get_media_group_item(const char *group_name, filter_h filter, media_group_e group, media_info_cb callback, void *user_data);
-int _media_db_get_storage(filter_h filter, media_storage_cb callback, void *user_data);
-int _media_db_get_storage_id_by_media_id(const char *media_id, char **storage_id);
 
-int _media_filter_attribute_generate(filter_h filter, char **generated_condition);
-int _media_filter_attribute_option_generate(filter_h filter, char **generated_option);
-int _media_filter_attribute_option_generate_with_full_query(filter_h filter, char **generated_option);
+int _media_filter_build_condition(bool is_full, const char *condition, media_content_collation_e collate_type, char **result);
+int _media_filter_build_option(filter_h filter, char **result);
 
 
 #define FONT_COLOR_RESET    "\033[0m"
@@ -566,54 +503,60 @@ int _media_filter_attribute_option_generate_with_full_query(filter_h filter, cha
 
 #define media_content_gettid() syscall(__NR_gettid)
 
-#define media_content_retv_if(expr, val) do { \
+#define content_retv_if(expr, val) do { \
                        if (expr) { \
                                LOGE(FONT_COLOR_RED"[%ld]"FONT_COLOR_RESET, media_content_gettid());    \
                                return (val); \
                        } \
                } while (0)
 
-#define media_content_retvm_if(expr, val, fmt, arg...) do { \
+#define content_retvm_if(expr, val, fmt, arg...) do { \
                        if (expr) { \
                                LOGE(FONT_COLOR_RED"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
                                return (val); \
                        } \
                } while (0)
 
-#define media_content_warn(fmt, arg...) do { \
+#define content_retip_if_fail(expr) do { \
+                       if (!(expr)) { \
+                               LOGE(FONT_COLOR_RED"[%ld] Invalid [%s]"FONT_COLOR_RESET, media_content_gettid(), #expr); \
+                               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; \
+                       } \
+               } while (0)
+
+#define content_retipm_if_fail(expr, fmt, arg...) do { \
+                       if (!(expr)) { \
+                               LOGE(FONT_COLOR_RED"[%ld] Cond[%s] value["fmt"]"FONT_COLOR_RESET, media_content_gettid(), #expr, ##arg); \
+                               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; \
+                       } \
+               } while (0)
+
+#define content_warn(fmt, arg...) do { \
                        LOGW(FONT_COLOR_GREEN"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
                } while (0)
 
-#define media_content_debug(fmt, arg...) do { \
+#define content_debug(fmt, arg...) do { \
                        LOGD(FONT_COLOR_RESET"[%ld]"fmt"", media_content_gettid(), ##arg);     \
                } while (0)
 
-#define media_content_info(fmt, arg...) do { \
+#define content_info(fmt, arg...) do { \
                        LOGI(FONT_COLOR_GREEN"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
                } while (0)
 
-#define media_content_error(fmt, arg...) do { \
+#define content_error(fmt, arg...) do { \
                        LOGE(FONT_COLOR_RED"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
                } while (0)
 
-#define media_content_debug_func() do { \
-                       LOGD(FONT_COLOR_RESET"[%ld]", media_content_gettid());     \
-               } while (0)
-
-#define media_content_sec_debug(fmt, arg...) do { \
+#define content_sec_debug(fmt, arg...) do { \
                        SECURE_LOGD(FONT_COLOR_CYAN"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
                } while (0)
 
-#define media_content_sec_warn(fmt, arg...) do { \
-                       SECURE_LOGW(FONT_COLOR_RED"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
-               } while (0)
-
-#define media_content_sec_error(fmt, arg...) do { \
+#define content_sec_error(fmt, arg...) do { \
                        SECURE_LOGE(FONT_COLOR_RED"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
                } while (0)
 
 #define ERR_BUF_LENGTH 256
-#define media_content_stderror(fmt) do { \
+#define content_stderror(fmt) do { \
                        char media_content_stderror_buf[ERR_BUF_LENGTH] = {0, }; \
                        strerror_r(errno, media_content_stderror_buf, ERR_BUF_LENGTH);  \
                        LOGE(FONT_COLOR_RED fmt" : STANDARD ERROR [%s]"FONT_COLOR_RESET, media_content_stderror_buf); \