Remove storage account

Change-Id: I8862711247525943b1f0337dae4c58b240d48ff4
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/include/media-svc.h b/include/media-svc.h
index 9890eb951c9e2c4d732728affc89a550aee1dc19..e14324c303f7f3a4030f337ca53ad59514a93b8f 100755 (executable)
--- 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 db95258fc62a398ad9657e4802ade779c99464e9..1dbcb9069c046ab0143e2aa600ea94a33a250465 100644 (file)
--- 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 9a9c29ee5a5cff881c2edc62397b610441bac297..083247397a61feeafe62c95ad25f5860a30096a1 100755 (executable)
--- 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 639d49fff85128d6f85b0511d69a884a65ae7cde..739f61a37f417eed8f9b051927181b4f1b261234 100755 (executable)
--- 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 3b3fd19b2be7886081052d9e2dc4830052391935..c4d4b4bc53b3d4af9c6af27b1d4f3b8078d17ab7 100755 (executable)
--- 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 c997f3180de7683ed774c1c07b83207acba1b41d..9c2c70902c0776c15b936e5e67d746718ede292b 100755 (executable)
--- 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 91693832be223b905dc6f801a6616b5b428b4378..7385fe07799caa227b2ede9f2ee2083cb5d950c0 100755 (executable)
--- 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);