Update the query when removing invalid folder

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

diff --git a/include/media-svc.h b/include/media-svc.h
index 237c245..a7dbc63 100755 (executable)
--- a/include/media-svc.h
+++ b/include/media-svc.h
@@ -85,7 +85,7 @@ int media_svc_get_storage_path(MediaSvcHandle *handle, const char *storage_uuid,
 int media_svc_get_storage_scan_status(MediaSvcHandle *handle, const char *storage_uuid, media_svc_scan_status_type_e *storage_status);
 int media_svc_set_storage_scan_status(const char *storage_uuid, media_svc_scan_status_type_e storage_status, uid_t uid);
 int media_svc_get_storage_list(MediaSvcHandle *handle, char ***storage_list, char ***storage_id_list, int **scan_status_list, int *count);
-int media_svc_delete_invalid_folder(const char *storage_id, 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(MediaSvcHandle *handle, const char *storage_id, const char *start_path, int validity, bool is_recursive, uid_t uid);
 
 int media_svc_insert_item_pass1(MediaSvcHandle *handle, const char *storage_id, media_svc_storage_type_e storage_type, const char *path, int is_burst, uid_t uid);

diff --git a/packaging/libmedia-service.spec b/packaging/libmedia-service.spec
index 7b196b5..c222a7a 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.2.76
+Version: 0.2.77
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0 and public domain

diff --git a/plugin/media-content-plugin.c b/plugin/media-content-plugin.c
index 60d4900..9cee799 100755 (executable)
--- a/plugin/media-content-plugin.c
+++ b/plugin/media-content-plugin.c
@@ -980,11 +980,11 @@ int insert_folder(void * handle, const char *storage_id, const char *file_path,
        return MEDIA_SVC_PLUGIN_ERROR_NONE;
 }
 
-int delete_invalid_folder(void * handle, const char *storage_id, uid_t uid, char **err_msg)
+int delete_invalid_folder(void * handle, const char *storage_id, int storage_type, uid_t uid, char **err_msg)
 {
        int ret = MEDIA_SVC_PLUGIN_ERROR_NONE;
 
-       ret = media_svc_delete_invalid_folder(storage_id, uid);
+       ret = media_svc_delete_invalid_folder(storage_id, storage_type, uid);
        if (ret < 0) {
                __set_error_message(ret, err_msg);
                return MEDIA_SVC_PLUGIN_ERROR;

diff --git a/src/common/media-svc-media-folder.c b/src/common/media-svc-media-folder.c
index a1a89b1..e072551 100755 (executable)
--- a/src/common/media-svc-media-folder.c
+++ b/src/common/media-svc-media-folder.c
@@ -585,12 +585,12 @@ 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, uid_t uid)
+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 '%s' WHERE storage_uuid = '%q' AND validity = 0;", MEDIA_SVC_DB_TABLE_FOLDER, storage_id);
+       sql = sqlite3_mprintf("DELETE FROM '%s' WHERE storage_uuid = '%q' AND storage_type = %d validity = 0;", MEDIA_SVC_DB_TABLE_FOLDER, storage_type, storage_id);
        ret = _media_svc_sql_query(sql, uid);
 
        sqlite3_free(sql);

diff --git a/src/common/media-svc.c b/src/common/media-svc.c
index d1a9edb..1dd8cc0 100755 (executable)
--- a/src/common/media-svc.c
+++ b/src/common/media-svc.c
@@ -1993,11 +1993,11 @@ int media_svc_insert_folder(MediaSvcHandle *handle, const char *storage_id, medi
        return ret;
 }
 
-int media_svc_delete_invalid_folder(const char *storage_id, uid_t uid)
+int media_svc_delete_invalid_folder(const char *storage_id, int storage_type, uid_t uid)
 {
        int ret = MS_MEDIA_ERR_NONE;
 
-       ret = _media_svc_delete_invalid_folder(storage_id, uid);
+       ret = _media_svc_delete_invalid_folder(storage_id, storage_type, uid);
 
        return ret;
 }

diff --git a/src/include/common/media-svc-media-folder.h b/src/include/common/media-svc-media-folder.h
index 328f963..b515f15 100755 (executable)
--- a/src/include/common/media-svc-media-folder.h
+++ b/src/include/common/media-svc-media-folder.h
@@ -34,7 +34,7 @@ int _media_svc_update_folder_table(const char *storage_id, uid_t uid);
 int _media_svc_get_all_folders(sqlite3 *handle, char *start_path, char ***folder_list, time_t **modified_time_list, int **item_num_list, int *count);
 int _media_svc_get_and_append_folder_id_by_folder_path(sqlite3 *handle, const char *storage_id, const char *path, media_svc_storage_type_e storage_type, char *folder_id, bool stack_query, uid_t uid);
 int _media_svc_get_folder_info_by_foldername(sqlite3 *handle, const char *storage_id, const char *folder_name, char *folder_id, time_t *modified_time);
-int _media_svc_delete_invalid_folder(const char *storage_id, 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);
 int _media_svc_delete_folder_by_storage_id(const char *storage_id, media_svc_storage_type_e storage_type, uid_t uid);
 GList ** _media_svc_get_folder_list_ptr(void);