[ACR-1735] Remove deprecated APIs
[platform/core/api/media-content.git] / include_product / media_info_private.h
old mode 100755 (executable)
new mode 100644 (file)
index 259f24e..6abf6db
@@ -15,8 +15,8 @@
 */
 
 
-#ifndef __TIZEN_MEDIA_INFO_PRIVATE_H__
-#define __TIZEN_MEDIA_INFO_PRIVATE_H__
+#ifndef __TIZEN_CONTENT_MEDIA_INFO_PRIVATE_H__
+#define __TIZEN_CONTENT_MEDIA_INFO_PRIVATE_H__
 
 
 #include <unistd.h>
@@ -32,7 +32,7 @@
 #include <media-util.h>
 #include <errno.h>
 #include <tzplatform_config.h>
-#ifdef _USE_TV_PROFILE
+#ifdef _USE_TVPD_MODE
 #include <media_content_type_product.h>
 #endif
 
@@ -51,18 +51,17 @@ extern "C" {
 *
 * @file media_info_private.h
 * @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, author, genre and description tags. \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 SAFE_G_FREE(src)       {if (src) {g_free(src); src = NULL; } }
 #define STRING_VALID(str)              ((str != NULL && strlen(str) > 0) ? TRUE : FALSE)
 #define SQLITE3_FINALIZE(x)    {if (x != NULL) sqlite3_finalize(x); }
 #define SQLITE3_SAFE_FREE(x)   {if (x != NULL) {sqlite3_free(x); x = NULL; } }
@@ -73,11 +72,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 EMPTY_STR ""
+#define BATCH_REQUEST_FILE_LEN 255
 
 typedef enum {
        MEDIA_INFO_UUID = 0,
@@ -92,13 +89,6 @@ typedef enum {
        MEDIA_INFO_DESCRIPTION,
        MEDIA_INFO_RATING,
        MEDIA_INFO_FAVOURITE,
-       MEDIA_INFO_AUTHOR,
-       MEDIA_INFO_PROVIDER,
-       MEDIA_INFO_CONTENT_NAME,
-       MEDIA_INFO_CATEGORY,
-       MEDIA_INFO_LOCATION_TAG,
-       MEDIA_INFO_AGE_RATING,
-       MEDIA_INFO_KEYWORD,
        MEDIA_INFO_IS_DRM,
        MEDIA_INFO_STORAGE_TYPE,
        MEDIA_INFO_LONGITUDE,
@@ -125,34 +115,21 @@ typedef enum {
        MEDIA_INFO_BITRATE,
        MEDIA_INFO_BITPERSAMPLE,
        MEDIA_INFO_DURATION,
-       MEDIA_INFO_PLAYED_COUNT,
-       MEDIA_INFO_LAST_PLAYED_TIME,
-       MEDIA_INFO_LAST_PLAYED_POSITION,
        MEDIA_INFO_SAMPLERATE,
        MEDIA_INFO_CHANNEL,
-       MEDIA_INFO_BURST_ID,
        MEDIA_INFO_TIMELINE,
-       MEDIA_INFO_WEATHER,
-       MEDIA_INFO_SYNC_STATUS,
        MEDIA_INFO_STORAGE_UUID,
        MEDIA_INFO_IS_360,
+       MEDIA_INFO_PLAYED_COUNT,
+       MEDIA_INFO_LAST_PLAYED_TIME,
+       MEDIA_INFO_LAST_PLAYED_POSITION,
        MEDIA_INFO_STITCHED_INFO,
        MEDIA_INFO_EXTRACT_FLAG,
        MEDIA_INFO_MODIFIED_MONTH,
-#ifdef _USE_SENIOR_MODE
-       MEDIA_INFO_CONTACT,
-       MEDIA_INFO_APP_DATA,
-#endif
        MEDIA_INFO_ITEM_MAX,
 } media_info_item_e;
 
 typedef enum {
-       MEDIA_CONTENT_TYPE = 0,
-       MEDIA_THUMBNAIL_TYPE,
-       MEDIA_REGISTER_TYPE
-} media_info_error_type_e;
-
-typedef enum {
        MEDIA_TAG_ADD,
        MEDIA_TAG_REMOVE,
        MEDIA_TAG_UPDATE_TAG_NAME,
@@ -175,17 +152,12 @@ 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,
        MEDIA_GROUP_PVR,
        MEDIA_GROUP_UHD,
 } group_list_e;
 
-typedef enum {
-       MEDIA_BATCH_INSERT_NORMAL,
-       MEDIA_BATCH_INSERT_BURSTSHOT,
-} media_batch_insert_e;
-
 typedef struct _filter_s {
        char *storage_id;
        char *condition;
@@ -195,17 +167,16 @@ typedef struct _filter_s {
        media_content_collation_e order_collate_type;
        int offset;
        int count;
+       bool is_full_condition;
+       bool is_full_order;
 } filter_s;
 
 typedef struct {
        char *folder_id;
-       char *parent_folder_id;
        char *path;
        char *name;
-       time_t modified_time;
-       media_content_storage_e storage_type;
+       ms_user_storage_type_e storage_type;
        char *storage_uuid;
-       int folder_order;
 } media_folder_s;
 
 typedef struct {
@@ -241,9 +212,6 @@ typedef struct {
        int width;
        int height;
        char *date_taken;
-       char *title;
-       char *burst_id;
-       char *weather;
        char *exposure_time;
        double fnumber;
        int iso;
@@ -251,14 +219,8 @@ typedef struct {
        media_content_orientation_e orientation;
 } image_meta_s;
 
-typedef struct _image_mm_meta_s {
-       int width;
-       int height;
-} image_mm_meta_s;
-
 typedef struct {
        char *media_id;
-       char *title;
        char *album;
        char *artist;
        char *album_artist;
@@ -272,15 +234,11 @@ typedef struct {
        int duration;
        int width;
        int height;
-       int played_count;
        int rotation;
-       time_t played_time;
-       int played_position;
 } video_meta_s;
 
 typedef struct {
        char *media_id;
-       char *title;
        char *album;
        char *artist;
        char *album_artist;
@@ -295,13 +253,18 @@ typedef struct {
        int samplerate;
        int channel;
        int duration;
-       int played_count;
-       time_t played_time;
-       int played_position;
 } audio_meta_s;
 
 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;
@@ -315,17 +278,9 @@ typedef struct {
        double longitude;
        double latitude;
        double altitude;
-       char *weather;
        int rating;
        time_t favourite;
        char *title;
-       char *author;
-       char *provider;
-       char *content_name;
-       char *category;
-       char *location_tag;
-       char *age_rating;
-       char *keyword;
        int is_drm;
        int storage_type;
        int played_count;
@@ -333,19 +288,15 @@ typedef struct {
        int played_position;
        char *modified_month;
        char *storage_uuid;
-       int sync_status;
        unsigned int request_id;
        unsigned int face_request_id;
        int is_360;
        int stitched_info;
        int extract_flag;
-#ifdef _USE_SENIOR_MODE
-       char* contact;
-       char* app_data;
-#endif
        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 {
@@ -364,14 +315,7 @@ typedef struct {
 } media_playlist_item_s;
 
 typedef struct {
-       char *storage_id;
-       char *storage_name;
-       char *storage_path;
-       int storage_type;
-} media_storage_s;
-
-typedef struct {
-       char *face_id;                          /* face uuid */
+       int face_id;                            /* face id */
        char *media_id;                 /* media uuid */
        unsigned int face_rect_x;       /* x position of face */
        unsigned int face_rect_y;       /* y position of face */
@@ -429,6 +373,7 @@ typedef struct {
        int play_count;
        int highlight;
        char* private_data;
+       unsigned int service_profile;
 } media_pvr_s;
 
 typedef struct {
@@ -446,18 +391,7 @@ typedef struct {
        int played_count;
 } media_uhd_s;
 
-typedef struct _attribute_map_s {
-       GHashTable *attr_map;
-} attribute_s;
-
 typedef struct {
-       media_info_s *handle;
-       void *user_data;
-       media_thumbnail_completed_cb thumbnail_completed_cb;
-} media_thumbnail_cb_s;
-
-typedef struct {
-       media_info_s *handle;
        void *user_data;
        media_face_detection_completed_cb face_completed_cb;
 } media_face_cb_s;
@@ -473,9 +407,6 @@ typedef struct {
        void *user_data;
 } media_noti_cb_s;
 
-typedef struct attribute_s *attribute_h;
-
-
 typedef struct _media_content_cb_data {
        media_scan_completed_cb callback;
        void *user_data;
@@ -496,7 +427,6 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define DB_TABLE_PLAYLIST_MAP  "playlist_map"
 #define DB_TABLE_BOOKMARK              "bookmark"
 #define DB_TABLE_STORAGE               "storage"
-#define DB_TABLE_MEDIA_VIEW    "media_view"
 #define DB_TABLE_FACE                  "face"
 #define DB_TABLE_FACE_SCAN_LIST        "face_scan_list"
 #define DB_TABLE_PVR                           "pvr"
@@ -505,133 +435,37 @@ typedef struct _media_content_scan_cb_data_v2 {
 /* DB View */
 #define DB_VIEW_PLAYLIST       "playlist_view"
 #define DB_VIEW_TAG                    "tag_view"
-
-/* DB Table Alias */
-#define DB_TABLE_ALIAS_MEDIA                   "m"
-#define DB_TABLE_ALIAS_FOLDER                  "f"
-#define DB_TABLE_ALIAS_PLAYLIST                        "p"
-#define DB_TABLE_ALIAS_PLAYLIST_MAP    "pm"
-#define DB_TABLE_ALIAS_TAG                             "t"
-#define DB_TABLE_ALIAS_BOOKMARK                "b"
-#define DB_TABLE_ALIAS_ALBUM                   "a"
+#define DB_VIEW_MEDIA          "media_view"
 
 /* DB field for media */
-#define DB_FIELD_MEDIA_ID                                      "media_uuid"
-#define DB_FIELD_MEDIA_PATH                            "path"
-#define DB_FIELD_MEDIA_DISPLAY_NAME            "file_name"
-#define DB_FIELD_MEDIA_TYPE                                    "media_type"
-#define DB_FIELD_MEDIA_MIME_TYPE                       "mime_type"
-#define DB_FIELD_MEDIA_SIZE                                    "size"
-#define DB_FIELD_MEDIA_ADDED_TIME                      "added_time"
-#define DB_FIELD_MEDIA_MODIFIED_TIME           "modified_time"
-#define DB_FIELD_MEDIA_FOLDER_ID                       "folder_uuid"
-#define DB_FIELD_MEDIA_TIMELINE                                "timeline"
-#define DB_FIELD_MEDIA_THUMBNAIL_PATH  "thumbnail_path"
-#define DB_FIELD_MEDIA_TITLE                           "title"
-#define DB_FIELD_MEDIA_ALBUM                           "album"
-#define DB_FIELD_MEDIA_ARTIST                          "artist"
-#define DB_FIELD_MEDIA_ALBUM_ARTIST                    "album_artist"
-#define DB_FIELD_MEDIA_GENRE                           "genre"
-#define DB_FIELD_MEDIA_COMPOSER                        "composer"
-#define DB_FIELD_MEDIA_YEAR                            "year"
-#define DB_FIELD_MEDIA_RECORDED_DATE           "recorded_date"
-#define DB_FIELD_MEDIA_COPYRIGHT                       "copyright"
-#define DB_FIELD_MEDIA_TRACK_NUM                       "track_num"
-#define DB_FIELD_MEDIA_DESCRIPTION                     "description"
-#define DB_FIELD_MEDIA_BITRATE                         "bitrate"
-#define DB_FIELD_MEDIA_BITPERSAMPLE            "bitpersample"
-#define DB_FIELD_MEDIA_SAMPLERATE                      "samplerate"
-#define DB_FIELD_MEDIA_CHANNEL                 "channel"
-#define DB_FIELD_MEDIA_DURATION                        "duration"
-#define DB_FIELD_MEDIA_LONGITUDE                       "longitude"
-#define DB_FIELD_MEDIA_LATITUDE                        "latitude"
-#define DB_FIELD_MEDIA_ALTITUDE                        "altitude"
-#define DB_FIELD_MEDIA_WIDTH                           "width"
-#define DB_FIELD_MEDIA_HEIGHT                          "height"
-#define DB_FIELD_MEDIA_DATETAKEN                       "datetaken"
-#define DB_FIELD_MEDIA_ORIENTATION             "orientation"
-#define DB_FIELD_MEDIA_BURST_ID                        "burst_id"
+#define DB_FIELD_MEDIA_DISPLAY_NAME            "media_display_name"
+#define DB_FIELD_MEDIA_TYPE                            "media_type"
+#define DB_FIELD_MEDIA_MIME_TYPE               "media_mime_type"
+#define DB_FIELD_MEDIA_SIZE                            "media_size"
+#define DB_FIELD_MEDIA_ADDED_TIME              "media_added_time"
+#define DB_FIELD_MEDIA_MODIFIED_TIME   "media_modified_time"
+#define DB_FIELD_MEDIA_TITLE                   "media_title"
+#define DB_FIELD_MEDIA_ALBUM                   "media_album"
+#define DB_FIELD_MEDIA_ARTIST                  "media_artist"
+#define DB_FIELD_MEDIA_ALBUM_ARTIST            "media_album_artist"
+#define DB_FIELD_MEDIA_GENRE                   "media_genre"
+#define DB_FIELD_MEDIA_COMPOSER                        "media_composer"
+#define DB_FIELD_MEDIA_YEAR                            "media_year"
+#define DB_FIELD_MEDIA_RECORDED_DATE   "media_recorded_date"
+#define DB_FIELD_MEDIA_COPYRIGHT               "media_copyright"
+#define DB_FIELD_MEDIA_TRACK_NUM               "media_track_num"
+#define DB_FIELD_MEDIA_DESCRIPTION             "media_description"
+#define DB_FIELD_MEDIA_RATING                  "media_rating"
+#define DB_FIELD_MEDIA_LONGITUDE               "media_longitude"
+#define DB_FIELD_MEDIA_LATITUDE                "media_latitude"
+#define DB_FIELD_MEDIA_ALTITUDE                "media_altitude"
+
 #define DB_FIELD_MEDIA_PLAYED_COUNT            "played_count"
 #define DB_FIELD_MEDIA_LAST_PLAYED_TIME                "last_played_time"
 #define DB_FIELD_MEDIA_LAST_PLAYED_POSITION    "last_played_position"
-#define DB_FIELD_MEDIA_RATING                          "rating"
-#define DB_FIELD_MEDIA_FAVOURITE                       "favourite"
-#define DB_FIELD_MEDIA_AUTHOR                          "author"
-#define DB_FIELD_MEDIA_PROVIDER                        "provider"
-#define DB_FIELD_MEDIA_CONTENT_NAME            "content_name"
-#define DB_FIELD_MEDIA_CATEGORY                        "category"
-#define DB_FIELD_MEDIA_LOCATION_TAG            "location_tag"
-#define DB_FIELD_MEDIA_AGE_RATING                      "age_rating"
-#define DB_FIELD_MEDIA_KEYWORD                 "keyword"
-#define DB_FIELD_MEDIA_WEATHER                 "weather"
-#define DB_FIELD_MEDIA_IS_DRM                          "is_drm"
-#define DB_FIELD_MEDIA_STORAGE_TYPE            "storage_type"
 #define DB_FIELD_MEDIA_MODIFIED_MONTH  "modified_month"
 #define DB_FIELD_MEDIA_MODIFIED_DATE   "modified_date"
-#define DB_FIELD_MEDIA_EXPOSURE_TIME   "exposure_time"
-#define DB_FIELD_MEDIA_FNUMBER                 "fnumber"
-#define DB_FIELD_MEDIA_ISO                             "iso"
-#define DB_FIELD_MEDIA_MODEL                   "model"
-#define DB_FIELD_MEDIA_FILE_NAME_PINYIN                        "file_name_pinyin"
-#define DB_FIELD_MEDIA_TITLE_PINYIN                                    "title_pinyin"
-#define DB_FIELD_MEDIA_ALBUM_PINYIN                            "album_pinyin"
-#define DB_FIELD_MEDIA_ARTIST_PINYIN                           "artist_pinyin"
-#define DB_FIELD_MEDIA_ALBUM_ARTIST_PINYIN             "album_artist_pinyin"
-#define DB_FIELD_MEDIA_GENRE_PINYIN                            "genre_pinyin"
-#define DB_FIELD_MEDIA_COMPOSER_PINYIN                 "composer_pinyin"
-#define DB_FIELD_MEDIA_COPYRIGHT_PINYIN                        "copyright_pinyin"
-#define DB_FIELD_MEDIA_DESCRIPTION_PINYIN                      "description_pinyin"
-#define DB_FIELD_MEDIA_AUTHOR_PINYIN                           "author_pinyin"
-#define DB_FIELD_MEDIA_PROVIDER_PINYIN                 "provider_pinyin"
-#define DB_FIELD_MEDIA_CONTENT_NAME_PINYIN             "content_name_pinyin"
-#define DB_FIELD_MEDIA_CATEGORY_PINYIN                 "category_pinyin"
-#define DB_FIELD_MEDIA_LOCATION_TAG_PINYIN             "location_tag_pinyin"
-#define DB_FIELD_MEDIA_AGE_RATING_PINYIN                       "age_rating_pinyin"
-#define DB_FIELD_MEDIA_KEYWORD_PINYIN                          "keyword_pinyin"
-#define DB_FIELD_MEDIA_360                                                     "is_360"
 #define DB_FIELD_MEDIA_STITCHED_INFO                           "stitched_info"
-#ifdef _USE_SENIOR_MODE
-#define DB_FIELD_MEDIA_CONTACT                 "contact"
-#define DB_FIELD_MEDIA_APP_DATA                        "app_data"
-#endif
-
-/* DB field for folder */
-#define DB_FIELD_FOLDER_ID                             "folder_uuid"
-#define DB_FIELD_FOLDER_PATH                   "path"
-#define DB_FIELD_FOLDER_NAME                   "name"
-#define DB_FIELD_FOLDER_MODIFIED_TIME  "modified_time"
-#define DB_FIELD_FOLDER_STORAGE_TYPE   "storage_type"
-#define DB_FIELD_FOLDER_NAME_PINYIN    "name_pinyin"
-#define DB_FIELD_FOLDER_ORDER                  "folder_order"
-#define DB_FIELD_FOLDER_PARENT_FOLDER_ID       "parent_folder_uuid"
-
-/* DB field for playlist */
-#define DB_FIELD_PLAYLIST_ID                                   "playlist_id"
-#define DB_FIELD_PLAYLIST_NAME                         "name"
-#define DB_FIELD_PLAYLIST_MEMBER_ORDER "play_order"
-#define DB_FIELD_PLAYLIST_MEDIA_COUNT                  "media_count"
-
-/* DB field for tag */
-#define DB_FIELD_TAG_ID                        "tag_id"
-#define DB_FIELD_TAG_NAME              "name"
-#define DB_FIELD_TAG_MEDIA_COUNT                       "media_count"
-
-/* DB field for bookmark */
-#define DB_FIELD_BOOKMARK_ID   "bookmark_id"
-#define DB_FIELD_BOOKMARK_MARKED_TIME  "marked_time"
-#define DB_FIELD_BOOKMARK_NAME "name"
-
-/* DB field for album*/
-#define DB_FIELD_ALBUM_ID                      "album_id"
-#define DB_FIELD_ALBUM_NAME            "name"
-#define DB_FIELD_ALBUM_ARTIST          "artist"
-
-/* DB field for Storage*/
-#define DB_FIELD_STORAGE_ID                    "storage_uuid"
-#define DB_FIELD_STORAGE_PATH          "storage_path"
-
-/* DB field for Face */
-#define DB_FIELD_FACE_TAG                      "face_tag"
 
 /* DB field for PVR*/
 #define DB_FIELD_PVR_DURATION                                  "duration"
@@ -685,158 +519,131 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define DB_FIELD_UHD_FILE_NAME                 "file_name"
 #define DB_FIELD_UHD_PLAYED_COUNT                      "played_count"
 
-/* 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 ")"
-
 /* DB TABLE JOIN */
-/*#define FOLDER_MEDIA_JOIN                                    "("DB_TABLE_FOLDER" AS f LEFT OUTER JOIN '%s' AS m ON f.folder_uuid=m.folder_uuid AND m.validity=1) WHERE f.storage_uuid IN (SELECT storage_uuid FROM "DB_TABLE_STORAGE" WHERE validity=1) " */
-#define FOLDER_MEDIA_JOIN                                      "("DB_TABLE_FOLDER" AS f LEFT OUTER JOIN '%s' AS m ON f.folder_uuid=m.folder_uuid AND m.validity=1) WHERE f.validity=1 "
-#define BOOKMARK_MEDIA_JOIN                            "("DB_TABLE_BOOKMARK" AS b INNER JOIN '%s' AS m \
-                                                                                       ON (b.media_uuid = m.media_uuid)) WHERE m.validity=1"
-#define ALBUM_MEDIA_JOIN                                       "("DB_TABLE_ALBUM" AS a INNER JOIN '%s' AS m \
-                                                                                       ON (a.album_id = m.album_id)) WHERE m.validity=1"
-#define FACE_MEDIA_JOIN                                                "("DB_TABLE_FACE" AS fa INNER JOIN '%s' AS m \
-                                                                                               ON (fa.media_uuid = m.media_uuid)) WHERE m.validity=1"
+#define FOLDER_MEDIA_JOIN              DB_TABLE_FOLDER" NATURAL LEFT OUTER JOIN '%s' WHERE validity=1 "
+#define BOOKMARK_MEDIA_JOIN            DB_TABLE_BOOKMARK" NATURAL JOIN '%s' WHERE validity=1 "
+#define ALBUM_MEDIA_JOIN               DB_TABLE_ALBUM" NATURAL JOIN '%s' WHERE validity=1 "
+#define FACE_MEDIA_JOIN                        DB_TABLE_FACE" NATURAL JOIN '%s' WHERE validity=1 "
 
 /* Get Group info */
 #define SELECT_MEDIA_GROUP_AND_COUNT           "SELECT %s, COUNT(*) FROM '%s' WHERE validity=1 "
 
 /* Get Group List */
-#define SELECT_ALBUM_LIST                      "SELECT DISTINCT a.album_id, a.name, a.artist, a.album_art FROM "ALBUM_MEDIA_JOIN
+#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 '%s' WHERE validity=1 "
 
-#define SELECT_FOLDER_LIST                     "SELECT DISTINCT f.folder_uuid, f.path, f.name, f.storage_type, f.modified_time, f.storage_uuid, f.folder_order, f.parent_folder_uuid FROM "FOLDER_MEDIA_JOIN
-#define SELECT_FOLDER_LIST_BY_STORAGE_ID       SELECT_FOLDER_LIST"AND f.storage_uuid='%s' "
-#define SELECT_TAG_LIST                                "SELECT DISTINCT tag_id, name FROM "DB_VIEW_TAG" WHERE 1 "
-#define SELECT_PLAYLIST_LIST                   "SELECT DISTINCT playlist_id, name, p_thumbnail_path FROM "DB_VIEW_PLAYLIST" WHERE 1 "
+#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 "
 
 /* Get Group Count */
-#define SELECT_ALBUM_COUNT             "SELECT COUNT(DISTINCT a.album_id) FROM "ALBUM_MEDIA_JOIN
-#define SELECT_FOLDER_COUNT            "SELECT COUNT(DISTINCT f.folder_uuid) FROM "FOLDER_MEDIA_JOIN
-#define SELECT_FOLDER_COUNT_BY_STORAGE_ID              SELECT_FOLDER_COUNT"AND f.storage_uuid='%s' "
+#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_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_BOOKMARK_COUNT  "SELECT COUNT(DISTINCT b.bookmark_id) FROM "BOOKMARK_MEDIA_JOIN
+#define SELECT_BOOKMARK_COUNT  "SELECT COUNT(*) FROM "BOOKMARK_MEDIA_JOIN
 #define SELECT_MEDIA_GROUP_COUNT       "SELECT COUNT(*) FROM ("SELECT_MEDIA_GROUP_LIST
 /*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)*/
 
 /* 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 '%s' WHERE validity=1 "             /*to apply limit condition. "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE validity=1" */
 #define SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE   "SELECT COUNT(*) FROM '%s' WHERE validity=1 "
 #define SELECT_MEDIA_COUNT_FROM_ALBUM                  "SELECT COUNT(*) FROM '%s' WHERE validity=1 AND album_id='%d'"
 #define SELECT_MEDIA_COUNT_FROM_GROUP                  "SELECT COUNT(*) FROM ("SELECT_MEDIA_FROM_GROUP         /*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_FOLDER                 "SELECT COUNT(*) FROM '%s' WHERE validity=1 AND folder_uuid='%q'"
-#define SELECT_MEDIA_COUNT_FROM_STORAGE                        "SELECT COUNT(*) FROM '%s' WHERE validity=1 AND storage_uuid='%q'"
-#define SELECT_MEDIA_COUNT_FROM_TAG                            "SELECT COUNT(*) FROM "DB_VIEW_TAG" WHERE (tag_id=%d AND media_count>0) "
-#define SELECT_MEDIA_COUNT_FROM_PLAYLIST                       "SELECT COUNT(*) FROM "DB_VIEW_PLAYLIST" WHERE (playlist_id=%d and media_count>0) "
+#define SELECT_MEDIA_COUNT_FROM_FOLDER                 "SELECT COUNT(*) FROM '%s' WHERE validity=1 AND folder_id='%s'"
+#define SELECT_MEDIA_COUNT_FROM_STORAGE                        "SELECT COUNT(*) FROM '%s' WHERE validity=1 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 * FROM "DB_TABLE_ALBUM" WHERE album_id=%d"
-#define SELECT_FOLDER_FROM_FOLDER              "SELECT * FROM "DB_TABLE_FOLDER" WHERE folder_uuid='%s'"
-#define SELECT_FOLDER_BY_PATH                  "SELECT * FROM "DB_TABLE_FOLDER" WHERE path='%q'"
-#define SELECT_PLAYLIST_FROM_PLAYLIST  "SELECT * FROM "DB_TABLE_PLAYLIST" WHERE playlist_id=%d"
-#define SELECT_TAG_FROM_TAG                    "SELECT * FROM "DB_TABLE_TAG" WHERE tag_id=%d"
-#define SELECT_TAG_BY_NAME                             "SELECT * FROM "DB_TABLE_TAG" WHERE name='%q'"
+#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_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'"
 
 /* Tag info*/
-#define INSERT_TAG_TO_TAG                                              "INSERT INTO "DB_TABLE_TAG" (name) VALUES (%Q)"
-#define REMOVE_TAG_ITEM_FROM_TAG_MAP           "DELETE FROM "DB_TABLE_TAG_MAP" WHERE tag_id=%d AND media_uuid='%q';"
-#define UPDATE_TAG_NAME_FROM_TAG                       "UPDATE "DB_TABLE_TAG" SET name='%q' WHERE tag_id=%d;"
-#define SELECT_TAG_COUNT_BY_MEDIA_ID                   "SELECT COUNT(*) FROM "DB_VIEW_TAG" WHERE media_uuid = '%s'"
-#define SELECT_TAG_LIST_BY_MEDIA_ID                            "SELECT tag_id, name FROM "DB_VIEW_TAG" WHERE media_uuid = '%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 */
-#ifdef _USE_SENIOR_MODE
-#define MEDIA_INFO_ITEM "media_uuid, path, file_name, media_type, mime_type, size, added_time, modified_time, thumbnail_path, description, \
-                                                       rating, favourite, author, provider, content_name, category, location_tag, age_rating, keyword, is_drm, storage_type, longitude, latitude, altitude, exposure_time, fnumber, iso, model, width, height, datetaken, orientation, title, album, artist, album_artist, genre, composer, year, recorded_date, copyright, track_num, bitrate, bitpersample, duration, played_count, last_played_time, last_played_position, samplerate, channel, burst_id, timeline, weather, sync_status, storage_uuid, is_360, stitched_info, extract_flag, modified_date, contact, app_data"
-#else
-#define MEDIA_INFO_ITEM "media_uuid, path, file_name, media_type, mime_type, size, added_time, modified_time, thumbnail_path, description, \
-                                                       rating, favourite, author, provider, content_name, category, location_tag, age_rating, keyword, is_drm, storage_type, longitude, latitude, altitude, exposure_time, fnumber, iso, model, width, height, datetaken, orientation, title, album, artist, album_artist, genre, composer, year, recorded_date, copyright, track_num, bitrate, bitpersample, duration, played_count, last_played_time, last_played_position, samplerate, channel, burst_id, timeline, weather, sync_status, storage_uuid, is_360, stitched_info, extract_flag, modified_date"
-#endif
-
-/*Folder info*/
-#define UPDATE_FOLDER_ORDER                                    "UPDATE "DB_TABLE_FOLDER" SET folder_order=%d WHERE folder_uuid=%Q"
+#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_composer, media_year, media_recorded_date, media_copyright, media_track_num, media_bitrate, media_bitpersample, media_duration, media_samplerate, media_channel, \
+                                                       media_timeline, storage_uuid, media_360, played_count, last_played_time, last_played_position, stitched_info, extract_flag, modified_date"
 
 /* Playlist Info */
-#define INSERT_PLAYLIST_TO_PLAYLIST                                            "INSERT INTO "DB_TABLE_PLAYLIST" (name) VALUES (%Q)"
-#define UPDATE_PLAYLIST_NAME_FROM_PLAYLIST                     "UPDATE "DB_TABLE_PLAYLIST" SET name='%q' WHERE playlist_id=%d;"
+#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 name='%q'"
-#define SELECT_PLAYLIST_ITEM_ID_FROM_PLAYLIST_VIEW     "SELECT pm_id, media_uuid FROM "DB_VIEW_PLAYLIST" WHERE (playlist_id=%d and media_count>0) "
-#define SELECT_PLAYLIST_ITEM_ALL_FROM_PLAYLIST_VIEW    "SELECT "MEDIA_INFO_ITEM", pm_id FROM "DB_VIEW_PLAYLIST" WHERE (playlist_id=%d and media_count>0) "
-#define SELECT_PLAY_ORDER_FROM_PLAYLIST_VIEW                   "SELECT play_order FROM "DB_VIEW_PLAYLIST" WHERE playlist_id=%d and pm_id=%d"
-#define SELECT_MAX_PLAY_ORDER_FROM_PLAYLIST_VIEW       "SELECT MAX(play_order) FROM "DB_VIEW_PLAYLIST" 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_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 play_order=%d 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_uuid, marked_time, thumbnail_path, name) VALUES ('%q', '%d', %Q, %Q)"
-#define SELECT_BOOKMARK_COUNT_BY_MEDIA_ID              "SELECT COUNT(*) FROM "BOOKMARK_MEDIA_JOIN" AND b.media_uuid='%s'"
-#define SELECT_BOOKMARK_LIST_BY_MEDIA_ID                       "SELECT b.bookmark_id, b.media_uuid, b.marked_time, b.thumbnail_path, b.name FROM "BOOKMARK_MEDIA_JOIN" AND b.media_uuid='%s'"
-#define UPDATE_BOOKMARK_FROM_BOOKMARK          "UPDATE "DB_TABLE_BOOKMARK" SET name=%Q WHERE bookmark_id=%d;"
-
-/* Update Meta*/
-#define UPDATE_AV_META_FROM_MEDIA      "UPDATE '%s' SET played_count=%d, last_played_time=%d, last_played_position=%d WHERE media_uuid='%q'"
-#define UPDATE_IMAGE_META_FROM_MEDIA   "UPDATE '%s' SET orientation=%d, weather=%Q WHERE media_uuid='%q'"
-
-#define UPDATE_VIDEO_MM_DATA_FROM_MEDIA                "UPDATE '%s' SET bitrate=%d, duration=%d, width=%d, height=%d WHERE media_uuid='%q'"
-#define UPDATE_AUDIO_MM_DATA_FROM_MEDIA                "UPDATE '%s' SET duration=%d, bitrate=%d, bitpersample=%d, samplerate=%d, channel=%d WHERE media_uuid='%q'"
-#define UPDATE_IMAGE_MM_DATA_FROM_MEDIA                "UPDATE '%s' SET width=%d, height=%d WHERE media_uuid='%q'"
-#define SELECT_VIDEO_MM_DATA_FROM_MEDIA                "SELECT bitrate, duration, width, height FROM '%s' WHERE media_uuid='%q'"
-#define SELECT_AUDIO_MM_DATA_FROM_MEDIA                "SELECT duration, bitrate, bitpersample, samplerate, channel FROM '%s' WHERE media_uuid='%q'"
-#define SELECT_IMAGE_MM_DATA_FROM_MEDIA                "SELECT width, height FROM '%s' WHERE media_uuid='%q'"
+#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 '%s' WHERE validity=1"
-#define SELECT_MEDIA_FROM_MEDIA                        "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND media_uuid='%s'"
-#define SELECT_MEDIA_BY_PATH                           "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND path='%q'"
+#define SELECT_MEDIA_FROM_MEDIA                        "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND media_id='%s'"
+#define SELECT_MEDIA_BY_PATH                           "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND media_path='%q'"
 #define SELECT_MEDIA_FROM_ALBUM                        "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND album_id=%d"
 #define SELECT_MEDIA_FROM_GROUP                        "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND %s='%q'"
 #define SELECT_MEDIA_FROM_GROUP_NULL   "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND %s IS NULL"
-#define SELECT_MEDIA_FROM_FOLDER                       "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND folder_uuid='%s'"
+#define SELECT_MEDIA_FROM_FOLDER                       "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND folder_id='%s'"
 #define SELECT_MEDIA_FROM_STORAGE              "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND storage_uuid='%s'"
-#define SELECT_MEDIA_FROM_TAG                          "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE media_uuid IN (SELECT media_uuid FROM "DB_TABLE_TAG_MAP" WHERE tag_id=%d) AND validity=1"
-#define SELECT_MEDIA_FROM_PLAYLIST             "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE media_uuid IN (SELECT media_uuid FROM "DB_TABLE_PLAYLIST_MAP" WHERE playlist_id=%d) AND validity=1"
-#define SELECT_MEDIA_PATH_BY_ID                        "SELECT path FROM "DB_TABLE_MEDIA_VIEW" WHERE media_uuid='%q'"
-#define SELECT_MEDIA_STORAGE_ID_BY_ID          "SELECT storage_uuid FROM "DB_TABLE_MEDIA_VIEW" WHERE media_uuid='%q'"
+#define SELECT_MEDIA_FROM_TAG                          "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE media_id IN (SELECT media_id FROM "DB_TABLE_TAG_MAP" WHERE tag_id=%d) AND validity=1"
+#define SELECT_MEDIA_FROM_PLAYLIST             "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE media_id IN (SELECT media_id FROM "DB_TABLE_PLAYLIST_MAP" WHERE playlist_id=%d) AND validity=1"
+#define SELECT_MEDIA_PATH_BY_ID                        "SELECT media_path FROM "DB_VIEW_MEDIA" WHERE media_id='%q'"
+#define SELECT_MEDIA_STORAGE_ID_BY_ID          "SELECT storage_uuid FROM "DB_VIEW_MEDIA" WHERE media_id='%q'"
 
 /* Delete */
-#define DELETE_MEDIA_FROM_MEDIA_BATCH  "DELETE FROM  '%s' WHERE %s"
 #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 * FROM "DB_TABLE_STORAGE" WHERE validity=1"
-#define SELECT_STORAGE_INFO_FROM_STORAGE       "SELECT * FROM "DB_TABLE_STORAGE" WHERE validity=1 AND storage_uuid='%s'"
+#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 face_uuid='%q'"
-#define INSERT_FACE_TO_FACE                            "INSERT INTO "DB_TABLE_FACE" (face_uuid, media_uuid, face_rect_x , face_rect_y, face_rect_w, face_rect_h, orientation, face_tag) VALUES ('%q', '%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, orientation=%d, face_tag=%Q WHERE face_uuid='%q'"
-#define SELECT_MEDIA_COUNT_FROM_MEDIA_BY_ID            "SELECT COUNT(*) FROM "DB_TABLE_MEDIA_VIEW" WHERE media_uuid='%q' AND validity=1"
-#define SELECT_FACE_COUNT_BY_MEDIA_ID          "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN" AND fa.media_uuid='%s'"
-#define SELECT_FACE_LIST_BY_MEDIA_ID           "SELECT fa.face_uuid, fa.media_uuid, fa.face_rect_x, fa.face_rect_y, fa.face_rect_w, fa.face_rect_h, fa.orientation, fa.face_tag FROM "FACE_MEDIA_JOIN" AND fa.media_uuid='%s'"
-#define SELECT_FACE_PATH_FROM_MEDIA            "SELECT path FROM "DB_TABLE_MEDIA_VIEW" media_uuid='%s'"
-
-#define DEFAULT_MEDIA_STORAGE_ID                       "media"
-
-#define SELECT_VALID_STORAGE_FROM_PVR  "WHERE storage_uuid IN (SELECT storage_uuid FROM "DB_TABLE_STORAGE" WHERE validity=1)"
+#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_VIEW_MEDIA" WHERE media_id='%q' AND validity=1"
+#define SELECT_IMAGE_COUNT_FROM_MEDIA_BY_ID            "SELECT COUNT(*) FROM "DB_VIEW_MEDIA" WHERE media_id='%q' AND media_type=0 AND validity=1"
+#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_VALID_STORAGE_FROM_PVR  "WHERE storage_uuid IN (SELECT storage_id FROM "DB_TABLE_STORAGE" WHERE validity=1)"
 #define SELECT_PVR_COUNT                                       "SELECT COUNT(*) FROM "DB_TABLE_PVR" "SELECT_VALID_STORAGE_FROM_PVR
 #define SELECT_PVR_LIST                                        "SELECT * FROM "DB_TABLE_PVR" "SELECT_VALID_STORAGE_FROM_PVR
 #define SELECT_PVR_COUNT_BY_STORAGE_ID SELECT_PVR_COUNT" AND storage_uuid='%s'"
 #define SELECT_PVR_LIST_BY_STORAGE_ID          SELECT_PVR_LIST" AND storage_uuid='%s'"
-#define SELECT_PVR_FROM_PVR                            "SELECT * FROM "DB_TABLE_PVR" WHERE media_uuid='%q'"
-#define UPDATE_PVR_META_FROM_PVR               "UPDATE "DB_TABLE_PVR" SET program_title=%Q, content_lock=%d, content_watch=%d, play_count=%d, highlight=%d WHERE media_uuid='%q'"
-#define UPDATE_PVR_LOCAL_RECORD_PVR            "UPDATE "DB_TABLE_PVR" SET is_local_record=%d WHERE path='%q' AND storage_uuid='%q'"
+#define SELECT_PVR_FROM_PVR                            "SELECT * FROM "DB_TABLE_PVR" WHERE media_id='%q'"
+#define UPDATE_PVR_META_FROM_PVR               "UPDATE "DB_TABLE_PVR" SET program_title=%Q, content_lock=%d, content_watch=%d, play_count=%d, highlight=%d WHERE media_id='%q'"
+#define UPDATE_PVR_LOCAL_RECORD_PVR            "UPDATE "DB_TABLE_PVR" SET is_local_record=%d WHERE media_path='%q' AND storage_uuid='%q'"
 
 #define SELECT_PVR_GROUP_LIST                                          "SELECT DISTINCT %s FROM "DB_TABLE_PVR" "SELECT_VALID_STORAGE_FROM_PVR
 #define SELECT_PVR_GROUP_LIST_BY_STORAGE_ID            "SELECT DISTINCT %s FROM "DB_TABLE_PVR" WHERE storage_uuid='%s'"
@@ -853,7 +660,7 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define SELECT_PVR_GROUP_AND_COUNT_BY_STORAGE_ID               "SELECT %s, COUNT(*) FROM "DB_TABLE_PVR" WHERE storage_uuid='%s'"
 #define SELECT_PVR_GROUP_AND_COUNT                                             "SELECT %s, COUNT(*) FROM "DB_TABLE_PVR" "SELECT_VALID_STORAGE_FROM_PVR
 
-#define SELECT_VALID_STORAGE_FROM_UHD  "WHERE storage_uuid IN (SELECT storage_uuid FROM "DB_TABLE_STORAGE" WHERE validity=1)"
+#define SELECT_VALID_STORAGE_FROM_UHD  "WHERE storage_uuid IN (SELECT storage_id FROM "DB_TABLE_STORAGE" WHERE validity=1)"
 #define SELECT_UHD_GROUP_LIST                                          "SELECT DISTINCT %s FROM "DB_TABLE_UHD" "SELECT_VALID_STORAGE_FROM_UHD
 #define SELECT_UHD_GROUP_LIST_BY_STORAGE_ID            "SELECT DISTINCT %s FROM "DB_TABLE_UHD" WHERE storage_uuid='%s'"
 #define SELECT_UHD_GROUP_COUNT                                 "SELECT COUNT(*) FROM ("SELECT_UHD_GROUP_LIST
@@ -873,15 +680,15 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define SELECT_UHD_COUNT_BY_STORAGE_ID SELECT_UHD_COUNT" AND storage_uuid='%s'"
 #define SELECT_UHD_LIST                                        "SELECT * FROM "DB_TABLE_UHD" "SELECT_VALID_STORAGE_FROM_UHD
 #define SELECT_UHD_LIST_BY_STORAGE_ID  SELECT_UHD_LIST" AND storage_uuid='%s'"
-#define SELECT_UHD_FROM_UHD                            "SELECT * FROM "DB_TABLE_UHD" WHERE media_uuid='%q'"
-#define UPDATE_UHD_META_FROM_UHD               "UPDATE "DB_TABLE_UHD" SET content_title=%Q, release_date=%Q, played_position=%d, sub_type=%d, played_count=%d WHERE media_uuid='%q'"
+#define SELECT_UHD_FROM_UHD                            "SELECT * FROM "DB_TABLE_UHD" WHERE media_id='%q'"
+#define UPDATE_UHD_META_FROM_UHD               "UPDATE "DB_TABLE_UHD" SET content_title=%Q, release_date=%Q, played_position=%d, sub_type=%d, played_count=%d WHERE media_id='%q'"
 
-int _content_query_prepare(sqlite3_stmt **stmt, char *select_query, char *condition_query, char *option_query);
-int _content_error_capi(int type, int cotent_error);
+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);
-MediaSvcHandle* _content_get_db_handle(void);
-attribute_h _content_get_attirbute_handle(void);
-attribute_h _content_get_alias_attirbute_handle(void);
+sqlite3 * _content_get_db_handle(void);
+uid_t _content_get_uid(void);
 int _media_info_get_media_info_from_db(const char *path, const char *storage_id, media_info_h media);
 void _media_info_item_get_detail(sqlite3_stmt *stmt, media_info_h media);
 int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *group_count);
@@ -899,110 +706,17 @@ int _media_db_get_group_item_count_by_id(int group_id, filter_h filter, group_li
 int _media_db_get_group_item_count(const char *group_name, filter_h filter, group_list_e group_type, int *item_count);
 int _media_db_get_group_item_by_id(int group_id, filter_h filter, media_info_cb callback, void *user_data, group_list_e group_type);
 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);
-#ifdef _USE_SENIOR_MODE
-int _content_query_prepare_by_union_select(sqlite3_stmt **stmt, char *select_query1, char *condition_query1, char *option_query1, char *select_query2, char *condition_query2, char *option_query2);
-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);
-#endif
 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_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_db_get_storage_id_by_media_id(const char *media_id, char **storage_id);
 int _media_db_get_pvr(filter_h filter, media_pvr_cb callback, void *user_data);
 void _media_pvr_item_get_detail(sqlite3_stmt* stmt, media_pvr_h pvr);
 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 _media_db_get_uhd(filter_h filter, media_uhd_cb callback, void *user_data);
 void _media_uhd_item_get_detail(sqlite3_stmt* stmt, media_uhd_h uhd);
 
-/**
- * @internal
- * @brief Creates a media filter attribute handle.
- * @details This function creates a media filter attribute handle. The handle can be
- * used to convert to attributes of database from attributes of user.
- * @remarks The @a handle must be released with media_filter_attribute_destory() by you.
- * @param[out] filter A handle to media filter attribute
- * @return 0 on success, otherwise a negative error value.
- * @retval #MEDIA_CONTENT_ERROR_NONE Successful
- * @retval #MEDIA_CONTENT_ERROR_INVALID_PARAMETER Invalid parameter
- * @retval #MEDIA_CONTENT_ERROR_OUT_OF_MEMORY Out of memory
- * @retval #MEDIA_CONTENT_ERROR_PERMISSION_DENIED Permission denied
- * @see media_filter_attribute_destory()
- *
- */
-int _media_filter_attribute_create(attribute_h *attr);
-
-/**
- * @internal
- * @brief Add the attributes to the handle.
- * @details This function add the attribute to handle.
- * @param[in] filter The handle to media filter attribute
- * @param[in] user_attr The user attribute
- * @param[in] platform_attr The platform attribute
- * @return 0 on success, otherwise a negative error value.
- * @retval #MEDIA_CONTENT_ERROR_NONE Successful
- * @retval #MEDIA_CONTENT_ERROR_INVALID_PARAMETER Invalid parameter
- * @retval #MEDIA_CONTENT_ERROR_OUT_OF_MEMORY Out of memory
- * @retval #MEDIA_CONTENT_ERROR_PERMISSION_DENIED Permission denied
- * @see media_filter_attribute_remove()
- *
- */
-int _media_filter_attribute_add(attribute_h atrr, const char *user_attr, const char *platform_attr);
-
-/**
- * @internal
- * @brief Destroys a media filter attribute handle.
- * @details The function frees all resources related to the media filter attribute handle. The filter attribute
- * handle no longer can be used to perform any operation. A new handle
- * has to be created before the next usage.
- *
- * @param[in] filter The handle to media filter attribute
- * @return 0 on success, otherwise a negative error value.
- * @retval #MEDIA_CONTENT_ERROR_NONE Successful
- * @retval #MEDIA_CONTENT_ERROR_INVALID_PARAMETER Invalid parameter
- * @retval #MEDIA_CONTENT_ERROR_PERMISSION_DENIED Permission denied
- * @see media_filter_create()
- *
- */
-int _media_filter_attribute_destory(attribute_h attr);
-
-/**
- * @internal
- * @brief Replace to platform attributes from user attributes.
- * @details This function replace to platform attributes from user attributes to generate the WHERE clause
- * @param[in] filter The handle to media filter attribute
- * @param[in] user_attr The user attribute
- * @param[in] platform_attr The platform attribute
- * @return 0 on success, otherwise a negative error value.
- * @retval #MEDIA_CONTENT_ERROR_NONE Successful
- * @retval #MEDIA_CONTENT_ERROR_INVALID_PARAMETER Invalid parameter
- * @retval #MEDIA_CONTENT_ERROR_OUT_OF_MEMORY Out of memory
- * @retval #MEDIA_CONTENT_ERROR_PERMISSION_DENIED Permission denied
- * @see media_filter_attribute_create()
- * @see media_filter_attribute_destory()
- *
- */
-int _media_filter_attribute_generate(attribute_h attr, char *condition, media_content_collation_e collate_type, char **generated_condition);
-
-
-/**
- * @internal
- * @brief Replace to platform attributes from user attributes.
- * @details This function replace to platform attributes from user attributes to generate the WHERE clause
- * @param[in] filter The handle to media filter attribute
- * @param[in] attr The attribute
- * @param[in] generated_option The handle to generated option
- * @return 0 on success, otherwise a negative error value.
- * @retval #MEDIA_CONTENT_ERROR_NONE Successful
- * @retval #MEDIA_CONTENT_ERROR_INVALID_PARAMETER Invalid parameter
- * @retval #MEDIA_CONTENT_ERROR_DB_FAILED Filed DB
- * @retval #MEDIA_CONTENT_ERROR_PERMISSION_DENIED Permission denied
- * @see media_filter_attribute_create()
- * @see media_filter_attribute_destory()
- *
- */
-
-int _media_filter_attribute_option_generate(attribute_h attr, 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);
 
 GMutex* _content_get_db_mutex(void);
 
@@ -1018,54 +732,60 @@ GMutex* _content_get_db_mutex(void);
 
 #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"[%d]"FONT_COLOR_RESET, media_content_gettid());    \
+                               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"[%d]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
+                               LOGE(FONT_COLOR_RED"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
                                return (val); \
                        } \
                } while (0)
 
-#define media_content_warn(fmt, arg...) do { \
-                       LOGW(FONT_COLOR_GREEN"[%d]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
+#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 media_content_debug(fmt, arg...) do { \
-                       LOGD(FONT_COLOR_RESET"[%d]"fmt"", media_content_gettid(), ##arg);     \
+#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 media_content_info(fmt, arg...) do { \
-                       LOGI(FONT_COLOR_GREEN"[%d]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
+#define content_warn(fmt, arg...) do { \
+                       LOGW(FONT_COLOR_GREEN"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
                } while (0)
 
-#define media_content_error(fmt, arg...) do { \
-                       LOGE(FONT_COLOR_RED"[%d]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
+#define content_debug(fmt, arg...) do { \
+                       LOGD(FONT_COLOR_RESET"[%ld]"fmt"", media_content_gettid(), ##arg);     \
                } while (0)
 
-#define media_content_debug_func() do { \
-                       LOGD(FONT_COLOR_RESET"[%d]", media_content_gettid());     \
+#define content_info(fmt, arg...) do { \
+                       LOGI(FONT_COLOR_GREEN"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
                } while (0)
 
-#define media_content_sec_debug(fmt, arg...) do { \
-                       SECURE_LOGD(FONT_COLOR_CYAN"[%d]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
+#define content_error(fmt, arg...) do { \
+                       LOGE(FONT_COLOR_RED"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
                } while (0)
 
-#define media_content_sec_warn(fmt, arg...) do { \
-                       SECURE_LOGW(FONT_COLOR_RED"[%d]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
+#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_error(fmt, arg...) do { \
-                       SECURE_LOGE(FONT_COLOR_RED"[%d]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
+#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); \
@@ -1074,4 +794,4 @@ GMutex* _content_get_db_mutex(void);
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
-#endif /*__TIZEN_MEDIA_INFO_PRIVATE_H__*/
+#endif /*__TIZEN_CONTENT_MEDIA_INFO_PRIVATE_H__*/