Remove unnecessary path replacement

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

diff --git a/src/media_info.c b/src/media_info.c
index 6bdb93b18195ce76d45ca4f30b32a27a214593b6..062a25e363ce0f584cdc357aff0b1bc423159582 100755 (executable)
--- a/src/media_info.c
+++ b/src/media_info.c
@@ -1916,22 +1916,16 @@ int media_info_update_to_db(media_info_h media)
 int media_info_move_to_db(media_info_h media, const char* dst_path)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
-       char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0, };
        char repl_path[MAX_PATH_LEN] = {0, };
-       char org_repl_path[MAX_PATH_LEN] = {0, };
 
        media_content_retvm_if(media == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid media");
        media_content_retvm_if(!STRING_VALID(dst_path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid dst_path");
        memset(repl_path, 0, sizeof(repl_path));
-       memset(org_repl_path, 0, sizeof(org_repl_path));
        ret = _media_content_replace_path(dst_path, repl_path);
        media_content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed");
 
        media_info_s *_media = (media_info_s*)media;
 
-       ret = _media_content_replace_path(_media->file_path, org_repl_path);
-       media_content_retvm_if(!STRING_VALID(org_repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed");
-
        /* If dst_path is folder, append file_name */
        if (g_file_test(repl_path, G_FILE_TEST_IS_DIR)) {
                if (repl_path[strlen(repl_path) - 1] != '/')
@@ -1941,19 +1935,12 @@ int media_info_move_to_db(media_info_h media, const char* dst_path)
        }
 
        /* If the two paths are the same, do nothing */
-       media_content_retvm_if(g_strcmp0(repl_path, org_repl_path) == 0, MEDIA_CONTENT_ERROR_NONE, "Same path");
+       media_content_retvm_if(g_strcmp0(repl_path, _media->file_path) == 0, MEDIA_CONTENT_ERROR_NONE, "Same path");
 
        ret = __media_info_check_file_validity(repl_path);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
-       memset(storage_id, 0x00, sizeof(storage_id));
-       ret = media_svc_get_storage_id(_content_get_db_handle(), org_repl_path, storage_id, _content_get_uid());
-       if (ret != MS_MEDIA_ERR_NONE) {
-               media_content_error("media_svc_get_storage_id failed : %d", ret);
-               return _content_error_capi(ret);
-       }
-
-       ret = media_svc_move_item(_content_get_db_handle(), org_repl_path, repl_path, _media->media_id, _media->media_type, _media->mime_type, _content_get_uid());
+       ret = media_svc_move_item(_content_get_db_handle(), _media->file_path, repl_path, _media->media_id, _media->media_type, _media->mime_type, _content_get_uid());
        return _content_error_capi(ret);
 }
 
@@ -1962,14 +1949,9 @@ int media_info_create_thumbnail(media_info_h media, media_thumbnail_completed_cb
        int ret = MEDIA_CONTENT_ERROR_NONE;
        media_content_warn("DEPRECATION WARNING: media_info_create_thumbnail() is deprecated and will be removed from next release. Use media_info_generate_thumbnail() instead.");
        static unsigned int req_id = 0;
-       char repl_path[MAX_PATH_LEN] = {0, };
        media_info_s *_media = (media_info_s*)media;
 
        if (_media != NULL && STRING_VALID(_media->media_id) && STRING_VALID(_media->file_path)) {
-               memset(repl_path, 0, sizeof(repl_path));
-               ret = _media_content_replace_path(_media->file_path, repl_path);
-               media_content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed");
-
                media_thumbnail_cb_s *_thumb_cb = (media_thumbnail_cb_s*)calloc(1, sizeof(media_thumbnail_cb_s));
                media_content_retvm_if(_thumb_cb == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                req_id++;
@@ -1979,7 +1961,7 @@ int media_info_create_thumbnail(media_info_h media, media_thumbnail_completed_cb
                _thumb_cb->user_data = user_data;
                _thumb_cb->thumbnail_completed_cb = callback;
 
-               ret = thumbnail_request_from_db_async(_media->request_id, repl_path, (ThumbFunc)__media_info_thumbnail_completed_cb, (void *)_thumb_cb, _content_get_uid());
+               ret = thumbnail_request_from_db_async(_media->request_id, _media->file_path, (ThumbFunc)__media_info_thumbnail_completed_cb, (void *)_thumb_cb, _content_get_uid());
                ret = _content_error_capi(ret);
        } else {
                media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
@@ -1992,7 +1974,6 @@ int media_info_create_thumbnail(media_info_h media, media_thumbnail_completed_cb
 int media_info_generate_thumbnail(media_info_h media)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
-       char repl_path[MAX_PATH_LEN] = {0, };
        char *thumb_path = NULL;
        media_info_s *_media = (media_info_s*)media;
 
@@ -2001,11 +1982,7 @@ int media_info_generate_thumbnail(media_info_h media)
                if (STRING_VALID(_media->thumbnail_path))
                        return MEDIA_CONTENT_ERROR_NONE;
 
-               memset(repl_path, 0, sizeof(repl_path));
-               ret = _media_content_replace_path(_media->file_path, repl_path);
-               media_content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed");
-
-               ret = media_svc_create_thumbnail(_media->storage_uuid, repl_path, _media->media_type, _content_get_uid(), &thumb_path);
+               ret = media_svc_create_thumbnail(_media->storage_uuid, _media->file_path, _media->media_type, _content_get_uid(), &thumb_path);
                ret = _content_error_capi(ret);
                if (ret == MEDIA_CONTENT_ERROR_UNSUPPORTED_CONTENT) {
                        SAFE_FREE(thumb_path);
@@ -2047,7 +2024,6 @@ int media_info_start_face_detection(media_info_h media, media_face_detection_com
        int ret = MEDIA_CONTENT_ERROR_NONE;
        static unsigned int req_id = 0;
        media_info_s *_media = (media_info_s*)media;
-       char repl_path[MAX_PATH_LEN] = {0, };
 
        if (!__media_info_isFaceRecognition_feature_supported()) {
                media_content_error("NOT_SUPPORTED(0x%08x)", MEDIA_CONTENT_ERROR_NOT_SUPPORTED);
@@ -2060,9 +2036,6 @@ int media_info_start_face_detection(media_info_h media, media_face_detection_com
                        return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
                }
 
-               memset(repl_path, 0, sizeof(repl_path));
-               ret = _media_content_replace_path(_media->file_path, repl_path);
-               media_content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed");
                media_face_cb_s *_face_cb = (media_face_cb_s*)calloc(1, sizeof(media_face_cb_s));
                media_content_retvm_if(_face_cb == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
                req_id++;
@@ -2071,7 +2044,7 @@ int media_info_start_face_detection(media_info_h media, media_face_detection_com
                _face_cb->user_data = user_data;
                _face_cb->face_completed_cb = callback;
 
-               ret = dcm_request_extract_face_async(_media->face_request_id, repl_path, (FaceFunc)__media_info_face_completed_cb, (void *)_face_cb, _content_get_uid());
+               ret = dcm_request_extract_face_async(_media->face_request_id, _media->file_path, (FaceFunc)__media_info_face_completed_cb, (void *)_face_cb, _content_get_uid());
                ret = _content_error_capi(ret);
        } else {
                media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);