no content found happened in more than 2depth directory,folder uuid in folder and...

Change-Id: Ic0b27e27d7251061d1783279c8f3e2b1768135d8

diff --git a/src/server/media-server-device-block.c b/src/server/media-server-device-block.c
index db28e42..b3c1723 100755 (executable)
--- a/src/server/media-server-device-block.c
+++ b/src/server/media-server-device-block.c
@@ -105,7 +105,11 @@ int ms_usb_insert_handler(const char *mount_path, const char *mount_uuid)
 
                        MS_DBG_WARN("init storage data in DB");
                        /* update storage_id table set validity=0 first */
+#ifdef _USE_TVPD_MODE
+                       ms_validaty_change_all_items(handle, mount_uuid, MS_STORAGE_EXTERNAL_USB, false, uid);
+#else
                        ms_validaty_change_all_items(handle, mount_uuid, MS_STORAGE_EXTERNAL, false, uid);
+#endif
                        /*update folder table set validity = 0*/
                        ms_set_folder_validity(handle, mount_uuid, storage_path, MS_INVALID, TRUE, uid);
                        /* update folder table set scan_status=0 first */
@@ -695,7 +699,11 @@ int ms_check_mounted_storage(uid_t uid)
 
                                                ms_set_storage_validity(handle, storage_id, 1, uid);
                                                /* update storage_id table set validity=0 first */
+#ifdef _USE_TVPD_MODE
+                                               ms_validaty_change_all_items(handle, storage_id, MS_STORAGE_EXTERNAL_USB, false, uid);
+#else
                                                ms_validaty_change_all_items(handle, storage_id, MS_STORAGE_EXTERNAL, false, uid);
+#endif
                                                ms_set_folder_validity(handle, storage_id, mounted_path, MS_INVALID, TRUE, uid);
                                                /* update folder table set scan_status=0 first */
                                                ms_set_folder_scan_status(handle, storage_id, NULL, MS_DIR_SCAN_NONE, uid);

diff --git a/src/server/media-server-main.c b/src/server/media-server-main.c
index 299cda3..af2d2b3 100755 (executable)
--- a/src/server/media-server-main.c
+++ b/src/server/media-server-main.c
@@ -205,7 +205,7 @@ void _ms_datadisc_vconf_cb(void *data)
 
                                MS_DBG_WARN("init storage data in DB");
                                /* update storage_id table set validity=0 first */
-                               ms_validaty_change_all_items(handle, DATADISC_STORAGE_ID, MS_STORAGE_EXTERNAL, false, uid);
+                               ms_validaty_change_all_items(handle, DATADISC_STORAGE_ID, MS_STORAGE_EXTERNAL_USB, false, uid);
                                /*update folder table set validity = 0*/
                                ms_set_folder_validity(handle, DATADISC_STORAGE_ID, mnt_path, MS_INVALID, TRUE, uid);
                                /* update folder table set scan_status=0 first */
@@ -720,7 +720,7 @@ static int __ms_check_disc_status(void)
 
                                MS_DBG_WARN("init storage data in DB");
                                /* update storage_id table set validity=0 first */
-                               ms_validaty_change_all_items(handle, DATADISC_STORAGE_ID, MS_STORAGE_EXTERNAL, false, uid);
+                               ms_validaty_change_all_items(handle, DATADISC_STORAGE_ID, MS_STORAGE_EXTERNAL_USB, false, uid);
                                /*update folder table set validity = 0*/
                                ms_set_folder_validity(handle, DATADISC_STORAGE_ID, mnt_path, MS_INVALID, TRUE, uid);
                                /* update folder table set scan_status=0 first */

diff --git a/src/server/media-server-socket.c b/src/server/media-server-socket.c
index 0a667d7..8267df0 100755 (executable)
--- a/src/server/media-server-socket.c
+++ b/src/server/media-server-socket.c
@@ -530,7 +530,7 @@ int ms_send_storage_scan_request_senior_mode(void **handle)
                        if (validity == 0) {
                                ms_set_storage_validity(handle, storage_id, 1, uid);
                                /* update storage_id table set validity=0 first */
-                               ms_validaty_change_all_items(handle, storage_id, MS_STORAGE_EXTERNAL, false, uid);
+                               ms_validaty_change_all_items(handle, storage_id, MS_STORAGE_EXTERNAL_USB, false, uid);
                                ms_set_folder_validity(handle, storage_id, storage_path, MS_INVALID, TRUE, uid);
                                /* update folder table set scan_status=0 first */
                                ms_set_folder_scan_status(handle, storage_id, NULL, MS_DIR_SCAN_NONE, uid);