Move set_all_storage_items_validity

Move API from plugin to media-common

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

diff --git a/include/media-svc.h b/include/media-svc.h
index fa578fe..e6e76cb 100755 (executable)
--- a/include/media-svc.h
+++ b/include/media-svc.h
@@ -49,7 +49,6 @@ int media_svc_set_item_validity_end(uid_t uid);
 int media_svc_set_item_validity(const char *storage_id, const char *path, int validity, uid_t uid);
 int media_svc_delete_item_by_path(sqlite3 *handle, const char *storage_id, const char *path, uid_t uid);
 int media_svc_delete_invalid_items_in_storage(sqlite3 *handle, const char *storage_id, ms_user_storage_type_e storage_type, uid_t uid);
-int media_svc_set_all_storage_items_validity(const char *storage_id, ms_user_storage_type_e storage_type, int validity, uid_t uid);
 int media_svc_set_folder_items_validity(sqlite3 *handle, const char *storage_id, const char *folder_path, int validity, int recursive, uid_t uid);
 int media_svc_refresh_item(sqlite3 *handle, const char *storage_id, ms_user_storage_type_e storage_type, const char *path, uid_t uid);
 int media_svc_send_dir_update_noti(sqlite3 *handle, const char *storage_id, const char *dir_path, const char *folder_id, media_item_update_type_e update_type, int pid);

diff --git a/plugin/media-content-plugin.c b/plugin/media-content-plugin.c
index f64203b..6d918f9 100755 (executable)
--- a/plugin/media-content-plugin.c
+++ b/plugin/media-content-plugin.c
@@ -46,11 +46,6 @@ int insert_item(sqlite3 *handle, const char *storage_id, const char *file_path,
        return media_svc_insert_item_bulk(handle, storage_id, storage_type, file_path, uid);
 }
 
-int set_all_storage_items_validity(const char *storage_id, int storage_type, int validity, uid_t uid)
-{
-       return media_svc_set_all_storage_items_validity(storage_id, storage_type, validity, uid);
-}
-
 int set_folder_item_validity(sqlite3 *handle, const char *storage_id, const char *folder_path, int validity, int recursive, uid_t uid)
 {
        return media_svc_set_folder_items_validity(handle, storage_id, folder_path, validity, recursive, uid);

diff --git a/src/common/media-svc-media.c b/src/common/media-svc-media.c
index 07c1b54..85642da 100755 (executable)
--- a/src/common/media-svc-media.c
+++ b/src/common/media-svc-media.c
@@ -63,14 +63,13 @@ int _media_svc_count_record_with_path(sqlite3 *handle, const char *storage_id, c
 {
        int ret = MS_MEDIA_ERR_NONE;
        sqlite3_stmt *sql_stmt = NULL;
-
-       char *sql = sqlite3_mprintf("SELECT count(*) FROM '%q' WHERE path='%q'", storage_id, path);
+       char *sql = NULL;
 
        media_svc_retvm_if(!STRING_VALID(storage_id), MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
        media_svc_retvm_if(!STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "Path is NULL");
 
+       sql = sqlite3_mprintf("SELECT count(*) FROM '%q' WHERE path='%q'", storage_id, path);
        ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt);
-
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
        *count = sqlite3_column_int(sql_stmt, 0);
@@ -534,21 +533,6 @@ int _media_svc_update_thumbnail_path(const char *storage_id, const char *path, c
        return ret;
 }
 
-int _media_svc_update_storage_item_validity(const char *storage_id, ms_user_storage_type_e storage_type, int validity, uid_t uid)
-{
-       int ret = MS_MEDIA_ERR_NONE;
-
-       media_svc_retvm_if(!STRING_VALID(storage_id), MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
-       media_svc_retvm_if(_media_svc_check_storage_type(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
-
-       char *sql = sqlite3_mprintf("UPDATE '%q' SET validity=%d WHERE storage_type=%d;", storage_id, validity, storage_type);
-
-       ret = _media_svc_sql_query(sql, uid);
-       SQLITE3_SAFE_FREE(sql);
-
-       return ret;
-}
-
 int _media_svc_update_folder_item_validity(sqlite3 *handle, const char *storage_id, const char *folder_path, int validity, uid_t uid)
 {
        int ret = MS_MEDIA_ERR_NONE;

diff --git a/src/common/media-svc.c b/src/common/media-svc.c
index 277ecb0..54e5032 100755 (executable)
--- a/src/common/media-svc.c
+++ b/src/common/media-svc.c
@@ -590,11 +590,6 @@ int media_svc_delete_invalid_items_in_storage(sqlite3 *handle, const char *stora
        return _media_svc_delete_invalid_items(handle, storage_id, storage_type, uid);
 }
 
-int media_svc_set_all_storage_items_validity(const char *storage_id, ms_user_storage_type_e storage_type, int validity, uid_t uid)
-{
-       return _media_svc_update_storage_item_validity(storage_id, storage_type, validity, uid);
-}
-
 int media_svc_set_folder_items_validity(sqlite3 *handle, const char *storage_id, const char *folder_path, int validity, int recursive, uid_t uid)
 {
        if (recursive)

diff --git a/src/include/common/media-svc-media.h b/src/include/common/media-svc-media.h
index dffcf03..31a0066 100755 (executable)
--- a/src/include/common/media-svc-media.h
+++ b/src/include/common/media-svc-media.h
@@ -35,7 +35,6 @@ int _media_svc_get_thumbnail_path_by_path(sqlite3 *handle, const char *path, cha
 int _media_svc_get_media_type_by_path(sqlite3 *handle, const char *storage_id, const char *path, int *media_type);
 int _media_svc_delete_item_by_path(const char *storage_id, const char *path, bool stack_query, uid_t uid);
 int _media_svc_delete_invalid_items(sqlite3 *handle, const char *storage_id, ms_user_storage_type_e storage_type, uid_t uid);
-int _media_svc_update_storage_item_validity(const char *storage_id, ms_user_storage_type_e storage_type, int validity, uid_t uid);
 int _media_svc_update_folder_item_validity(sqlite3 *handle, const char *storage_id, const char *folder_path, int validity, uid_t uid);
 int _media_svc_update_recursive_folder_item_validity(const char *storage_id, const char *folder_path, int validity, uid_t uid);
 int _media_svc_update_item_validity(const char *storage_id, const char *path, int validity, bool stack_query, uid_t uid);