Move get_folder_id

Move API from plugin to media-common

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

diff --git a/include/media-svc.h b/include/media-svc.h
index e6e76cb..79a5b45 100755 (executable)
--- a/include/media-svc.h
+++ b/include/media-svc.h
@@ -74,7 +74,6 @@ int media_svc_insert_folder_begin(int data_cnt);
 int media_svc_insert_folder_end(uid_t uid);
 
 int media_svc_check_folder_exist_by_path(sqlite3 *handle, const char *storage_id, const char *folder_path);
-int media_svc_get_folder_id(sqlite3 *handle, const char *storage_id, const char *path, char *folder_id);
 
 int media_svc_append_query(const char *query, uid_t uid);
 int media_svc_send_query(uid_t uid);

diff --git a/plugin/media-content-plugin.c b/plugin/media-content-plugin.c
index 6d918f9..40281ec 100755 (executable)
--- a/plugin/media-content-plugin.c
+++ b/plugin/media-content-plugin.c
@@ -261,11 +261,6 @@ int check_folder_exist(sqlite3 *handle, const char *storage_id, const char *fold
        return media_svc_check_folder_exist_by_path(handle, storage_id, folder_path);
 }
 
-int get_folder_id(sqlite3 *handle, const char *storage_id, const char *path, char *folder_id)
-{
-       return media_svc_get_folder_id(handle, storage_id, path, folder_id);
-}
-
 int get_media_type(const char *path, int *mediatype)
 {
        return media_svc_get_media_type(path, mediatype);

diff --git a/src/common/media-svc-media-folder.c b/src/common/media-svc-media-folder.c
index e79014a..7c03a89 100755 (executable)
--- a/src/common/media-svc-media-folder.c
+++ b/src/common/media-svc-media-folder.c
@@ -388,31 +388,3 @@ int _media_svc_count_folder_with_path(sqlite3 *handle, const char *storage_id, c
 
        return MS_MEDIA_ERR_NONE;
 }
-
-int _media_svc_get_folder_uuid(sqlite3 *handle, const char *storage_id, const char *path, char *folder_id)
-{
-       int ret = MS_MEDIA_ERR_NONE;
-       sqlite3_stmt *sql_stmt = NULL;
-       char *sql = NULL;
-
-       media_svc_retvm_if(storage_id == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
-       media_svc_retvm_if(path == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
-
-       sql = sqlite3_mprintf("SELECT folder_uuid FROM %q WHERE (storage_uuid='%q' AND path='%q')", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, path);
-
-       ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt);
-
-       media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
-
-       SAFE_STRLCPY(folder_id, (const char *)sqlite3_column_text(sql_stmt, 0), MEDIA_SVC_UUID_SIZE+1);
-
-       SQLITE3_FINALIZE(sql_stmt);
-
-       if (!STRING_VALID(folder_id)) {
-               media_svc_error("Not found valid storage id [%s]", path);
-               ret = MS_MEDIA_ERR_INVALID_PARAMETER;
-       }
-
-       return ret;
-}
-

diff --git a/src/common/media-svc.c b/src/common/media-svc.c
index 54e5032..8d7ff15 100755 (executable)
--- a/src/common/media-svc.c
+++ b/src/common/media-svc.c
@@ -999,11 +999,6 @@ int media_svc_check_folder_exist_by_path(sqlite3 *handle, const char *storage_id
        return MS_MEDIA_ERR_NONE;
 }
 
-int media_svc_get_folder_id(sqlite3 *handle, const char *storage_id, const char *path, char *folder_id)
-{
-       return _media_svc_get_folder_uuid(handle, storage_id, path, folder_id);
-}
-
 int media_svc_append_query(const char *query, uid_t uid)
 {
        return _media_svc_append_query_list(query, uid);

diff --git a/src/include/common/media-svc-media-folder.h b/src/include/common/media-svc-media-folder.h
index 4f105e8..3ea637e 100755 (executable)
--- a/src/include/common/media-svc-media-folder.h
+++ b/src/include/common/media-svc-media-folder.h
@@ -37,6 +37,5 @@ int _media_svc_set_folder_validity(sqlite3 *handle, const char *storage_id, cons
 GList ** _media_svc_get_folder_list_ptr(void);
 
 int _media_svc_count_folder_with_path(sqlite3 *handle, const char *storage_id, const char *path, int *count);
-int _media_svc_get_folder_uuid(sqlite3 *handle, const char *storage_id, const char *path, char *folder_id);
 
 #endif /*_MEDIA_SVC_MEDIA_FOLDER_H_*/