mmfw vconf set the completed value when umount bd disk

Change-Id: I404a35c5496e602fab8dfc0aafe813bf1c943588

diff --git a/src/scanner-v2/media-scanner-extract-v2.c b/src/scanner-v2/media-scanner-extract-v2.c
index fbd5184..3b9987a 100755 (executable)
--- a/src/scanner-v2/media-scanner-extract-v2.c
+++ b/src/scanner-v2/media-scanner-extract-v2.c
@@ -296,7 +296,7 @@ NEXT:
 
                        ms_config_get_int(MS_DISC_ACCESS_STATE, &disc_state);
                        if (disc_state == MS_DISC_ACCESS) {
-                               MS_DBG("[CHANGE DISC STATE]");
+                               MS_DBG_WARN("[CHANGE DISC STATE]");
                                ms_config_set_int(MS_DISC_ACCESS_STATE, MS_DISC_NOT_ACCESS);
                        }
                }
@@ -392,7 +392,7 @@ gboolean msc_storage_extract_thread(void *data)
                                MS_DBG_ERR("%s is unmounted", update_path);
                                ret = MS_MEDIA_ERR_USB_UNMOUNTED;
                                msc_remove_extract_request(extract_data);
-                               goto NEXT;
+                               goto STOP_DISC;
                        }
                }
                ms_set_storage_scan_status(handle, extract_data->storage_id, MEDIA_EXTRACT_PROCESSING, uid);
@@ -402,20 +402,7 @@ gboolean msc_storage_extract_thread(void *data)
                if (ret != MS_MEDIA_ERR_NONE) {
                        MS_DBG_ERR("NOT ENOUGH MEMORY");
                        __msc_extract_set_db_status(MS_DB_STOPPED);
-                       if (strncmp(update_path, MEDIA_ROOT_PATH_DISC, strlen(MEDIA_ROOT_PATH_DISC)) == 0) {
-                               if (msc_get_disc_stg_scan_status()) {
-                                       MS_DBG("[DISC ACCESS STOP]");
-                                       msc_set_disc_stg_scan_status(false);
-
-                                       ms_config_get_int(MS_DISC_ACCESS_STATE, &disc_state);
-                                       if (disc_state == MS_DISC_ACCESS) {
-                                               MS_DBG("[CHANGE DISC STATE]");
-                                               ms_config_set_int(MS_DISC_ACCESS_STATE, MS_DISC_NOT_ACCESS);
-                                       }
-                               }
-                       }
-
-                       goto NEXT;
+                       goto STOP_DISC;
                }
 
                /*extract meta*/
@@ -431,19 +418,10 @@ gboolean msc_storage_extract_thread(void *data)
                        MS_DBG_WARN("storage scan force stopped");
                        /* set vconf key db extract status */
                        __msc_extract_set_db_status(MS_DB_STOPPED);
-                       if (msc_get_disc_stg_scan_status()) {
-                               MS_DBG("[DISC ACCESS STOP]");
-                               msc_set_disc_stg_scan_status(false);
 
-                               ms_config_get_int(MS_DISC_ACCESS_STATE, &disc_state);
-                               if (disc_state == MS_DISC_ACCESS) {
-                                       MS_DBG("[CHANGE DISC STATE]");
-                                       ms_config_set_int(MS_DISC_ACCESS_STATE, MS_DISC_NOT_ACCESS);
-                               }
-                       }
                        msc_del_extract_blocked_path(update_path);
                        msc_remove_extract_request(extract_data);
-                       goto NEXT;
+                       goto STOP_DISC;
                }
                if (extract_data->result == TRUE) {
                        MS_DBG_WARN("extract_data->result == TRUE, MS_STORAGE_SCAN_COMPLETE");
@@ -454,13 +432,20 @@ gboolean msc_storage_extract_thread(void *data)
                        ms_send_dir_update_noti(handle, extract_data->storage_id, update_path, NULL, MS_ITEM_UPDATE, extract_data->pid);
                        /* set vconf key db extract status */
                        __msc_extract_set_db_status(MS_DB_UPDATED);
+                       goto STOP_DISC;
+               }
+
+               goto NEXT;
+
+STOP_DISC:
+               if (strncmp(update_path, MEDIA_ROOT_PATH_DISC, strlen(MEDIA_ROOT_PATH_DISC)) == 0) {
                        if (msc_get_disc_stg_scan_status()) {
-                               MS_DBG("[DISC ACCESS END]");
+                               MS_DBG("[DISC ACCESS STOP]");
                                msc_set_disc_stg_scan_status(false);
 
                                ms_config_get_int(MS_DISC_ACCESS_STATE, &disc_state);
                                if (disc_state == MS_DISC_ACCESS) {
-                                       MS_DBG("[CHANGE DISC STATE]");
+                                       MS_DBG_WARN("[CHANGE DISC STATE]");
                                        ms_config_set_int(MS_DISC_ACCESS_STATE, MS_DISC_NOT_ACCESS);
                                }