Update the query when removing invalid folder

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

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index e1a739e..ca2ef02 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    A server for media content management
-Version:    0.2.101
+Version:    0.2.102
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0

diff --git a/src/common/include/media-common-db-svc.h b/src/common/include/media-common-db-svc.h
index 0c7eeb9..267332d 100755 (executable)
--- a/src/common/include/media-common-db-svc.h
+++ b/src/common/include/media-common-db-svc.h
@@ -81,7 +81,7 @@ typedef int (*GET_STORAGE_SCAN_STATUS)(void *, const char *, int *, char **);
 typedef int (*SET_STORAGE_SCAN_STATUS)(void *, const char *, int, uid_t, char **);
 typedef int (*GET_STORAGE_LIST)(void *, char ***, char ***, int **, int *, char **);
 typedef int (*INSERT_FOLDER)(void *, const char *, const char *, int, uid_t, char **);
-typedef int (*DELETE_INVALID_FOLDER)(void *, const char *, uid_t, char **);
+typedef int (*DELETE_INVALID_FOLDER)(void *, const char *, int, uid_t, char **);
 typedef int (*SET_FOLDER_VALIDITY)(void *, const char *, const char *, int, bool, uid_t, char **);
 typedef int (*INSERT_FOLDER_BEGIN)(void *, int, char **);
 typedef int (*INSERT_FOLDER_END)(void *, uid_t, char **);
@@ -138,7 +138,7 @@ int ms_get_storage_scan_status(void **handle, char *storage_id, media_scan_statu
 int ms_set_storage_scan_status(void **handle, char *storage_id, media_scan_status_e scan_status, uid_t uid);
 int ms_get_storage_list(void **handle, GArray **storage_array);
 int ms_insert_folder(void **handle, const char *storage_id, const char *path, uid_t uid);
-int ms_delete_invalid_folder(void **handle, const char *storage_id, uid_t uid);
+int ms_delete_invalid_folder(void **handle, const char *storage_id, int storage_type, uid_t uid);
 int ms_set_folder_validity(void **handle, const char *storage_id, const char *start_path, int validity, bool is_recursive, uid_t uid);
 int ms_scan_item_batch(void **handle, const char *storage_id, const char *path, uid_t uid, int *insert_count_for_partial, int *set_count_for_partial);
 int ms_scan_validate_item(void **handle, const char *storage_id, const char *path, uid_t uid, int *insert_count_for_partial, int *set_count_for_partial);

diff --git a/src/common/media-common-db-svc.c b/src/common/media-common-db-svc.c
index 638f158..339b8d9 100755 (executable)
--- a/src/common/media-common-db-svc.c
+++ b/src/common/media-common-db-svc.c
@@ -986,7 +986,7 @@ int ms_insert_folder(void **handle, const char *storage_id, const char *path, ui
        return res;
 }
 
-int ms_delete_invalid_folder(void **handle, const char *storage_id, uid_t uid)
+int ms_delete_invalid_folder(void **handle, const char *storage_id, int storage_type, uid_t uid)
 {
        int lib_index;
        int res = MS_MEDIA_ERR_NONE;
@@ -994,7 +994,7 @@ int ms_delete_invalid_folder(void **handle, const char *storage_id, uid_t uid)
        char *err_msg = NULL;
 
        for (lib_index = 0; lib_index < lib_num; lib_index++) {
-               ret = ((DELETE_INVALID_FOLDER)func_array[lib_index][eDELETE_INVALID_FOLDER])(handle[lib_index], storage_id, uid, &err_msg); /*dlopen*/
+               ret = ((DELETE_INVALID_FOLDER)func_array[lib_index][eDELETE_INVALID_FOLDER])(handle[lib_index], storage_id, storage_type, uid, &err_msg); /*dlopen*/
                if (ret != 0) {
                        MS_DBG_ERR("error : %s [%s] %s", g_array_index(so_array, char*, lib_index), err_msg, storage_id);
                        MS_SAFE_FREE(err_msg);

diff --git a/src/scanner-v2/media-scanner-scan-v2.c b/src/scanner-v2/media-scanner-scan-v2.c
index 76f1896..9d12fe4 100755 (executable)
--- a/src/scanner-v2/media-scanner-scan-v2.c
+++ b/src/scanner-v2/media-scanner-scan-v2.c
@@ -830,7 +830,7 @@ NEXT_SCAN:
 
                        __msc_remove_dir_scan_cb();
                }
-               if (ms_delete_invalid_folder(handle, storage_id, uid) != MS_MEDIA_ERR_NONE) {
+               if (ms_delete_invalid_folder(handle, storage_id, storage_type, uid) != MS_MEDIA_ERR_NONE) {
                        MS_DBG_ERR("delete invalid folder failed");
                        ret = MS_MEDIA_ERR_DB_DELETE_FAIL;
                }

diff --git a/src/scanner/media-scanner-scan.c b/src/scanner/media-scanner-scan.c
index f10c11e..63fb99d 100755 (executable)
--- a/src/scanner/media-scanner-scan.c
+++ b/src/scanner/media-scanner-scan.c
@@ -569,7 +569,7 @@ static int __msc_stg_scan(void **handle, const char *storage_id, const char*star
 
                /*remove invalid folder in folder table.*/
        if (__msc_check_mount_storage(new_start_path)) {
-               if (ms_delete_invalid_folder(handle, storage_id, uid) != MS_MEDIA_ERR_NONE) {
+               if (ms_delete_invalid_folder(handle, storage_id, storage_type, uid) != MS_MEDIA_ERR_NONE) {
                        MS_DBG_ERR("delete invalid folder failed");
                        ret = MS_MEDIA_ERR_DB_DELETE_FAIL;
                }