Move delete_invalid_folder

Move plugin to media-common

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

diff --git a/include/media-svc.h b/include/media-svc.h
index 9affb48..23e9c3a 100755 (executable)
--- a/include/media-svc.h
+++ b/include/media-svc.h
@@ -66,7 +66,6 @@ int media_svc_update_storage(sqlite3 *handle, const char *storage_id, const char
 int media_svc_set_storage_validity(sqlite3 *handle, const char *storage_id, int validity, uid_t uid);
 int media_svc_get_storage_id(sqlite3 *handle, const char *path, char *storage_id, uid_t uid);
 int media_svc_get_storage_list(sqlite3 *handle, char ***storage_list, char ***storage_id_list, int *count);
-int media_svc_delete_invalid_folder(const char *storage_id, int storage_type, uid_t uid);
 int media_svc_set_folder_validity(sqlite3 *handle, const char *storage_id, const char *start_path, int validity, bool is_recursive, uid_t uid);
 
 int media_svc_insert_folder_begin(int data_cnt);

diff --git a/plugin/media-content-plugin.c b/plugin/media-content-plugin.c
index 65cbfb6..5367929 100755 (executable)
--- a/plugin/media-content-plugin.c
+++ b/plugin/media-content-plugin.c
@@ -211,11 +211,6 @@ int insert_folder(sqlite3 *handle, const char *storage_id, const char *file_path
        return media_svc_insert_folder(handle, storage_id, storage_type, file_path, uid);
 }
 
-int delete_invalid_folder(const char *storage_id, int storage_type, uid_t uid)
-{
-       return media_svc_delete_invalid_folder(storage_id, storage_type, uid);
-}
-
 int set_folder_validity(sqlite3 *handle, const char *storage_id, const char* start_path, int validity, bool is_recursive, uid_t uid)
 {
        return media_svc_set_folder_validity(handle, storage_id, start_path, validity, is_recursive, uid);

diff --git a/src/common/media-svc-media-folder.c b/src/common/media-svc-media-folder.c
index 7c03a89..43f2f38 100755 (executable)
--- a/src/common/media-svc-media-folder.c
+++ b/src/common/media-svc-media-folder.c
@@ -324,19 +324,6 @@ int _media_svc_get_and_append_folder_id_by_folder_path(sqlite3 *handle, const ch
        return ret;
 }
 
-int _media_svc_delete_invalid_folder(const char *storage_id, int storage_type, uid_t uid)
-{
-       int ret = MS_MEDIA_ERR_NONE;
-       char *sql = NULL;
-
-       sql = sqlite3_mprintf("DELETE FROM %q WHERE storage_uuid = '%q' AND storage_type = %d AND validity = 0;", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, storage_type);
-       ret = _media_svc_sql_query(sql, uid);
-
-       SQLITE3_SAFE_FREE(sql);
-
-       return ret;
-}
-
 int _media_svc_set_folder_validity(sqlite3 *handle, const char *storage_id, const char *start_path, int validity, bool is_recursive, uid_t uid)
 {
        int ret = MS_MEDIA_ERR_NONE;

diff --git a/src/common/media-svc.c b/src/common/media-svc.c
index 4abc624..ce3a330 100755 (executable)
--- a/src/common/media-svc.c
+++ b/src/common/media-svc.c
@@ -962,11 +962,6 @@ int media_svc_insert_folder(sqlite3 *handle, const char *storage_id, ms_user_sto
        return ret;
 }
 
-int media_svc_delete_invalid_folder(const char *storage_id, int storage_type, uid_t uid)
-{
-       return _media_svc_delete_invalid_folder(storage_id, storage_type, uid);
-}
-
 int media_svc_set_folder_validity(sqlite3 *handle, const char *storage_id, const char *start_path, int validity, bool is_recursive, uid_t uid)
 {
        return _media_svc_set_folder_validity(handle, storage_id, start_path, validity, is_recursive, uid);

diff --git a/src/include/common/media-svc-media-folder.h b/src/include/common/media-svc-media-folder.h
index 3ea637e..f8a6969 100755 (executable)
--- a/src/include/common/media-svc-media-folder.h
+++ b/src/include/common/media-svc-media-folder.h
@@ -32,7 +32,6 @@ int _media_svc_update_folder_modified_time_by_folder_uuid(const char *folder_uui
 int _media_svc_get_and_append_folder(sqlite3 *handle, const char *storage_id, const char *path, ms_user_storage_type_e storage_type, char *folder_id, uid_t uid);
 int _media_svc_get_and_append_folder_id_by_path(sqlite3 *handle, const char *storage_id, const char *path, ms_user_storage_type_e storage_type, char *folder_id, uid_t uid);
 int _media_svc_get_and_append_folder_id_by_folder_path(sqlite3 *handle, const char *storage_id, const char *path, ms_user_storage_type_e storage_type, char *folder_id, bool stack_query, uid_t uid);
-int _media_svc_delete_invalid_folder(const char *storage_id, int storage_type, uid_t uid);
 int _media_svc_set_folder_validity(sqlite3 *handle, const char *storage_id, const char *start_path, int validity, bool is_recursive, uid_t uid);
 GList ** _media_svc_get_folder_list_ptr(void);