From a2001768c3b3c450584d2d7bec7f2bebc110af25 Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Wed, 4 Nov 2015 09:51:42 +0900 Subject: [PATCH] Change playlist, tag update logic Change-Id: I46acb0ae863fcedbd758de039ed3d9fdd802dc8c Signed-off-by: Minje Ahn --- include/media_info_private.h | 12 +++++------ packaging/capi-content-media-content.spec | 2 +- src/media_playlist.c | 34 ++++++++++++------------------- src/media_tag.c | 24 +++++++++------------- 4 files changed, 30 insertions(+), 42 deletions(-) diff --git a/include/media_info_private.h b/include/media_info_private.h index ba1669f..d70143d 100755 --- a/include/media_info_private.h +++ b/include/media_info_private.h @@ -591,8 +591,8 @@ typedef struct _media_content_cb_data { /* 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 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'" @@ -605,15 +605,15 @@ typedef struct _media_content_cb_data { /* 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 UPDATE_PLAYLIST_THUMBNAIL_FROM_PLAYLIST "UPDATE "DB_TABLE_PLAYLIST" SET thumbnail_path='%q' WHERE playlist_id=%d" +#define UPDATE_PLAYLIST_NAME_FROM_PLAYLIST "UPDATE "DB_TABLE_PLAYLIST" SET 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 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 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;" /* Bookmark */ #define INSERT_BOOKMARK_TO_BOOKMARK "INSERT INTO "DB_TABLE_BOOKMARK" (media_uuid, marked_time, thumbnail_path) VALUES ('%q', '%d', %Q)" diff --git a/packaging/capi-content-media-content.spec b/packaging/capi-content-media-content.spec index 4112e87..9cfbe1f 100755 --- a/packaging/capi-content-media-content.spec +++ b/packaging/capi-content-media-content.spec @@ -1,6 +1,6 @@ Name: capi-content-media-content Summary: A Media content library in SLP C API -Version: 0.2.73 +Version: 0.2.74 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/media_playlist.c b/src/media_playlist.c index ff14725..0729a84 100755 --- a/src/media_playlist.c +++ b/src/media_playlist.c @@ -120,12 +120,11 @@ static int __media_playlist_insert_item_to_playlist(int playlist_id, const char ++play_order; - query_str = sqlite3_mprintf("INSERT INTO %q (playlist_id, media_uuid, play_order) values (%d, '%q', %d)", + query_str = sqlite3_mprintf("INSERT INTO %q (playlist_id, media_uuid, play_order) values (%d, '%q', %d);", DB_TABLE_PLAYLIST_MAP, playlist_id, media_id, play_order); - ret = _content_query_sql(query_str); - SQLITE3_SAFE_FREE(query_str); + ret = media_svc_append_query(query_str, tzplatform_getuid(TZ_USER_NAME)); - return ret; + return _content_error_capi(MEDIA_CONTENT_TYPE, ret); } static int __media_playlist_remove_item_from_playlist(int playlist_id, int playlist_member_id) @@ -134,11 +133,9 @@ static int __media_playlist_remove_item_from_playlist(int playlist_id, int playl char *query_str = NULL; query_str = sqlite3_mprintf(REMOVE_PLAYLIST_ITEM_FROM_PLAYLIST_MAP, playlist_id, playlist_member_id); + ret = media_svc_append_query(query_str, tzplatform_getuid(TZ_USER_NAME)); - ret = _content_query_sql(query_str); - SQLITE3_SAFE_FREE(query_str); - - return ret; + return _content_error_capi(MEDIA_CONTENT_TYPE, ret); } static int __media_playlist_update_playlist_name(int playlist_id, const char *playlist_name) @@ -147,11 +144,9 @@ static int __media_playlist_update_playlist_name(int playlist_id, const char *pl char *query_str = NULL; query_str = sqlite3_mprintf(UPDATE_PLAYLIST_NAME_FROM_PLAYLIST, playlist_name, playlist_id); + ret = media_svc_append_query(query_str, tzplatform_getuid(TZ_USER_NAME)); - ret = _content_query_sql(query_str); - SQLITE3_SAFE_FREE(query_str); - - return ret; + return _content_error_capi(MEDIA_CONTENT_TYPE, ret); } static int __media_playlist_update_thumbnail_path(int playlist_id, const char *path) @@ -160,11 +155,9 @@ static int __media_playlist_update_thumbnail_path(int playlist_id, const char *p char *query_str = NULL; query_str = sqlite3_mprintf(UPDATE_PLAYLIST_THUMBNAIL_FROM_PLAYLIST, path, playlist_id); + ret = media_svc_append_query(query_str, tzplatform_getuid(TZ_USER_NAME)); - ret = _content_query_sql(query_str); - SQLITE3_SAFE_FREE(query_str); - - return ret; + return _content_error_capi(MEDIA_CONTENT_TYPE, ret); } static int __media_playlist_update_play_order(int playlist_id, int playlist_member_id, int play_order) @@ -173,11 +166,9 @@ static int __media_playlist_update_play_order(int playlist_id, int playlist_memb char *query_str = NULL; query_str = sqlite3_mprintf(UPDATE_PLAYLIST_ORDER_FROM_PLAYLIST_MAP, play_order, playlist_id, playlist_member_id); + ret = media_svc_append_query(query_str, tzplatform_getuid(TZ_USER_NAME)); - ret = _content_query_sql(query_str); - SQLITE3_SAFE_FREE(query_str); - - return ret; + return _content_error_capi(MEDIA_CONTENT_TYPE, ret); } static bool __media_playlist_media_info_cb(media_info_h media, void *user_data) @@ -868,10 +859,11 @@ int media_playlist_update_to_db(media_playlist_h playlist) } } } + ret = media_svc_send_query(tzplatform_getuid(TZ_USER_NAME)); __media_playlist_item_release(_playlist); - return ret; + return _content_error_capi(MEDIA_CONTENT_TYPE, ret); } int media_playlist_import_from_file(const char *path, const char *playlist_name, media_playlist_h *playlist) diff --git a/src/media_tag.c b/src/media_tag.c index b500db0..b34d218 100755 --- a/src/media_tag.c +++ b/src/media_tag.c @@ -58,12 +58,10 @@ static int __media_tag_insert_item_to_tag(int tag_id, const char *media_id) int ret = MEDIA_CONTENT_ERROR_NONE; char *query_str = NULL; - query_str = sqlite3_mprintf("INSERT INTO %q (tag_id, media_uuid) values (%d, '%q')", - DB_TABLE_TAG_MAP, tag_id, media_id); - ret = _content_query_sql(query_str); - SQLITE3_SAFE_FREE(query_str); + query_str = sqlite3_mprintf("INSERT INTO %q (tag_id, media_uuid) values (%d, '%q');", DB_TABLE_TAG_MAP, tag_id, media_id); + ret = media_svc_append_query(query_str, tzplatform_getuid(TZ_USER_NAME)); - return ret; + return _content_error_capi(MEDIA_CONTENT_TYPE, ret); } static int __media_tag_remove_item_from_tag(int tag_id, const char *media_id) @@ -72,11 +70,9 @@ static int __media_tag_remove_item_from_tag(int tag_id, const char *media_id) char *query_str = NULL; query_str = sqlite3_mprintf(REMOVE_TAG_ITEM_FROM_TAG_MAP, tag_id, media_id); + ret = media_svc_append_query(query_str, tzplatform_getuid(TZ_USER_NAME)); - ret = _content_query_sql(query_str); - SQLITE3_SAFE_FREE(query_str); - - return ret; + return _content_error_capi(MEDIA_CONTENT_TYPE, ret); } static int __media_tag_update_tag_name(int tag_id, const char *tag_name) @@ -85,11 +81,9 @@ static int __media_tag_update_tag_name(int tag_id, const char *tag_name) char *query_str = NULL; query_str = sqlite3_mprintf(UPDATE_TAG_NAME_FROM_TAG, tag_name, tag_id); + ret = media_svc_append_query(query_str, tzplatform_getuid(TZ_USER_NAME)); - ret = _content_query_sql(query_str); - SQLITE3_SAFE_FREE(query_str); - - return ret; + return _content_error_capi(MEDIA_CONTENT_TYPE, ret); } static int __media_tag_get_tag_info_from_db(const char *name, media_tag_h tag) @@ -487,7 +481,9 @@ int media_tag_update_to_db(media_tag_h tag) } } + ret = media_svc_send_query(tzplatform_getuid(TZ_USER_NAME)); + __media_tag_item_release(_tag); - return ret; + return _content_error_capi(MEDIA_CONTENT_TYPE, ret); } -- 2.7.4