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);
}
}
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);
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*/
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");
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);
}