From: Minje Ahn Date: Tue, 25 Apr 2017 02:18:10 +0000 (+0900) Subject: Remove storage account X-Git-Tag: accepted/tizen/unified/20170427.180232~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1462cd206b3d523dc569ab98eedeecca6ff2619f;p=platform%2Fcore%2Fmultimedia%2Flibmedia-service.git Remove storage account Change-Id: I8862711247525943b1f0337dae4c58b240d48ff4 Signed-off-by: Minje Ahn --- diff --git a/include/media-svc.h b/include/media-svc.h index 9890eb9..e14324c 100755 --- a/include/media-svc.h +++ b/include/media-svc.h @@ -76,7 +76,7 @@ void media_svc_destroy_content_info(media_svc_content_info_s *content_info); int media_svc_generate_uuid(char **uuid); int media_svc_get_mmc_info(MediaSvcHandle *handle, char **storage_name, char **storage_path, int *validity, bool *info_exist); int media_svc_check_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_name, char **storage_path, int *validity, uid_t uid); -int media_svc_insert_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_name, const char *storage_path, const char *storage_account, media_svc_storage_type_e storage_type, uid_t uid); +int media_svc_insert_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_name, const char *storage_path, media_svc_storage_type_e storage_type, uid_t uid); int media_svc_update_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_path, uid_t uid); int media_svc_delete_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_name, uid_t uid); int media_svc_set_storage_validity(MediaSvcHandle *handle, const char *storage_id, int validity, uid_t uid); diff --git a/packaging/libmedia-service.spec b/packaging/libmedia-service.spec index db95258..1dbcb90 100644 --- a/packaging/libmedia-service.spec +++ b/packaging/libmedia-service.spec @@ -1,6 +1,6 @@ Name: libmedia-service Summary: Media information service library for multimedia applications -Version: 0.3.0 +Version: 0.3.1 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 and PD diff --git a/plugin/media-content-plugin.c b/plugin/media-content-plugin.c index 9a9c29e..0832473 100755 --- a/plugin/media-content-plugin.c +++ b/plugin/media-content-plugin.c @@ -662,7 +662,7 @@ int insert_storage(void *handle, const char *storage_id, int storage_type, const return MEDIA_SVC_PLUGIN_ERROR; } - ret = media_svc_insert_storage(handle, storage_id, storage_name, storage_path, NULL, storage_type, uid); + ret = media_svc_insert_storage(handle, storage_id, storage_name, storage_path, storage_type, uid); if (ret < 0) { __set_error_message(ret, err_msg); return MEDIA_SVC_PLUGIN_ERROR; diff --git a/src/common/media-svc-db-utils.c b/src/common/media-svc-db-utils.c index 639d49f..739f61a 100755 --- a/src/common/media-svc-db-utils.c +++ b/src/common/media-svc-db-utils.c @@ -801,8 +801,6 @@ int _media_svc_init_table_query(const char *event_table_name) media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret); ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_STORAGE], "storage_path", MEDIA_SVC_DB_TYPE_TEXT, "NOT NULL", USER_V3, NULL, false, false, false); media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret); - ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_STORAGE], "storage_account", MEDIA_SVC_DB_TYPE_TEXT, NULL, USER_V3, NULL, false, false, false); - media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret); ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_STORAGE], "storage_type", MEDIA_SVC_DB_TYPE_INT, "DEFAULT 0", USER_V3, NULL, false, false, false); media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret); ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_STORAGE], "scan_status", MEDIA_SVC_DB_TYPE_INT, "DEFAULT 0", USER_V3, NULL, false, false, false); diff --git a/src/common/media-svc-storage.c b/src/common/media-svc-storage.c index 3b3fd19..c4d4b4b 100755 --- a/src/common/media-svc-storage.c +++ b/src/common/media-svc-storage.c @@ -135,11 +135,11 @@ int _media_svc_check_storage(sqlite3 *handle, const char *storage_id, const char return MS_MEDIA_ERR_NONE; } -int _media_svc_append_storage(const char *storage_id, const char *storage_name, const char *storage_path, const char *storage_account, media_svc_storage_type_e storage_type, uid_t uid) +int _media_svc_append_storage(const char *storage_id, const char *storage_name, const char *storage_path, media_svc_storage_type_e storage_type, uid_t uid) { int ret = MS_MEDIA_ERR_NONE; - char *sql = sqlite3_mprintf("INSERT INTO %s (storage_uuid, storage_name, storage_path, storage_account, storage_type) values (%Q, %Q, %Q, %Q, %d); ", - MEDIA_SVC_DB_TABLE_STORAGE, storage_id, storage_name, storage_path, storage_account, storage_type); + char *sql = sqlite3_mprintf("INSERT INTO %s (storage_uuid, storage_name, storage_path, storage_type) values (%Q, %Q, %Q, %d); ", + MEDIA_SVC_DB_TABLE_STORAGE, storage_id, storage_name, storage_path, storage_type); ret = _media_svc_sql_query(sql, uid); SQLITE3_SAFE_FREE(sql); diff --git a/src/common/media-svc.c b/src/common/media-svc.c index c997f31..9c2c709 100755 --- a/src/common/media-svc.c +++ b/src/common/media-svc.c @@ -1788,7 +1788,7 @@ int media_svc_update_storage(MediaSvcHandle *handle, const char *storage_id, con return _media_svc_update_storage_path(db_handle, storage_id, storage_path, uid); } -int media_svc_insert_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_name, const char *storage_path, const char *storage_account, media_svc_storage_type_e storage_type, uid_t uid) +int media_svc_insert_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_name, const char *storage_path, media_svc_storage_type_e storage_type, uid_t uid) { int ret = MS_MEDIA_ERR_NONE; sqlite3 *db_handle = (sqlite3 *)handle; @@ -1798,7 +1798,7 @@ int media_svc_insert_storage(MediaSvcHandle *handle, const char *storage_id, con media_svc_retvm_if(storage_path == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "storage_path is NULL"); media_svc_retvm_if(__media_svc_check_storage(storage_type, TRUE) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type"); - ret = _media_svc_append_storage(storage_id, storage_name, storage_path, storage_account, storage_type, uid); + ret = _media_svc_append_storage(storage_id, storage_name, storage_path, storage_type, uid); media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "append storage failed : %d", ret); if (strcmp(storage_id, MEDIA_SVC_DB_TABLE_MEDIA)) { diff --git a/src/include/common/media-svc-storage.h b/src/include/common/media-svc-storage.h index 9169383..7385fe0 100755 --- a/src/include/common/media-svc-storage.h +++ b/src/include/common/media-svc-storage.h @@ -27,7 +27,7 @@ int _media_svc_init_storage(sqlite3 *handle, uid_t uid); int _media_svc_get_mmc_info(MediaSvcHandle *handle, char **storage_name, char **storage_path, int *validity, bool *info_exist); int _media_svc_check_storage(sqlite3 *handle, const char *storage_id, const char *storage_name, char **storage_path, int *validity, uid_t uid); -int _media_svc_append_storage(const char *storage_id, const char *storage_name, const char *storage_path, const char *storage_account, media_svc_storage_type_e storage_type, uid_t uid); +int _media_svc_append_storage(const char *storage_id, const char *storage_name, const char *storage_path, media_svc_storage_type_e storage_type, uid_t uid); int _media_svc_update_storage_path(sqlite3 *handle, const char *storage_id, const char *path, uid_t uid); int _media_svc_delete_storage(const char *storage_id, const char *storage_name, uid_t uid); int _media_svc_update_storage_validity(const char *storage_id, int validity, uid_t uid);