diff options
Diffstat (limited to 'src/common/media-svc.c')
| -rwxr-xr-x | src/common/media-svc.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/src/common/media-svc.c b/src/common/media-svc.c index 6ae46f3..aab6eb5 100755 --- a/src/common/media-svc.c +++ b/src/common/media-svc.c @@ -189,8 +189,6 @@ int media_svc_get_modified_time(sqlite3 *handle, const char *storage_id, const c int media_svc_insert_item_begin(int data_cnt, int with_noti, int from_pid) { - media_svc_debug("Transaction data count : [%d]", data_cnt); - media_svc_retvm_if(data_cnt < 1, MS_MEDIA_ERR_INVALID_PARAMETER, "data_cnt shuld be bigger than 1"); g_media_svc_insert_item_data_cnt = data_cnt; @@ -261,11 +259,11 @@ int media_svc_insert_item_bulk(sqlite3 *handle, const char *storage_id, ms_user_ else if (media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE) ret = _media_svc_extract_image_metadata(&content_info); else - ret = _media_svc_extract_media_metadata(handle, &content_info, uid); + ret = _media_svc_extract_media_metadata(handle, true, &content_info, uid); media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info); /*Set or Get folder id*/ - ret = _media_svc_get_and_append_folder_id_by_path(handle, storage_id, path, storage_type, folder_uuid, uid); + ret = _media_svc_get_and_append_folder_id_by_path(handle, true, storage_id, path, storage_type, folder_uuid, uid); media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info); content_info.folder_uuid = g_strdup(folder_uuid); @@ -273,7 +271,7 @@ int media_svc_insert_item_bulk(sqlite3 *handle, const char *storage_id, ms_user_ if (g_media_svc_insert_item_data_cnt == 1) { - ret = _media_svc_insert_item_with_data(handle, storage_id, &content_info, FALSE, uid); + ret = _media_svc_insert_item_with_data(handle, true, storage_id, &content_info, FALSE, uid); media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info); if (g_insert_with_noti) @@ -281,7 +279,7 @@ int media_svc_insert_item_bulk(sqlite3 *handle, const char *storage_id, ms_user_ } else if (g_media_svc_insert_item_cur_data_cnt < (g_media_svc_insert_item_data_cnt - 1)) { - ret = _media_svc_insert_item_with_data(handle, storage_id, &content_info, TRUE, uid); + ret = _media_svc_insert_item_with_data(handle, true, storage_id, &content_info, TRUE, uid); media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info); if (g_insert_with_noti) @@ -291,7 +289,7 @@ int media_svc_insert_item_bulk(sqlite3 *handle, const char *storage_id, ms_user_ } else if (g_media_svc_insert_item_cur_data_cnt == (g_media_svc_insert_item_data_cnt - 1)) { - ret = _media_svc_insert_item_with_data(handle, storage_id, &content_info, TRUE, uid); + ret = _media_svc_insert_item_with_data(handle, true, storage_id, &content_info, TRUE, uid); media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info); if (g_insert_with_noti) @@ -349,13 +347,13 @@ int media_svc_insert_item_immediately(sqlite3 *handle, const char *storage_id, m } else if (media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE) { ret = _media_svc_extract_image_metadata(&content_info); } else { - ret = _media_svc_extract_media_metadata(handle, &content_info, uid); + ret = _media_svc_extract_media_metadata(handle, false, &content_info, uid); } media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info); /*Set or Get folder id*/ - ret = _media_svc_get_and_append_folder_id_by_path(handle, storage_id, path, storage_type, folder_uuid, uid); + ret = _media_svc_get_and_append_folder_id_by_path(handle, false, storage_id, path, storage_type, folder_uuid, uid); media_svc_retv_del_if(ret != MS_MEDIA_ERR_NONE, ret, &content_info); content_info.folder_uuid = g_strdup(folder_uuid); @@ -372,7 +370,7 @@ int media_svc_insert_item_immediately(sqlite3 *handle, const char *storage_id, m } } - ret = _media_svc_insert_item_with_data(handle, storage_id, &content_info, FALSE, uid); + ret = _media_svc_insert_item_with_data(handle, false, storage_id, &content_info, FALSE, uid); if (ret == MS_MEDIA_ERR_NONE) { media_svc_debug("Insertion is successful. Sending noti for this"); @@ -417,7 +415,7 @@ int media_svc_move_item(sqlite3 *handle, const char *src_path, const char *dest_ media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret); /*check and update folder*/ - ret = _media_svc_get_and_append_folder_id_by_path(handle, dst_stg_id, dest_path, dst_stg_type, folder_uuid, uid); + ret = _media_svc_get_and_append_folder_id_by_path(handle, false, dst_stg_id, dest_path, dst_stg_type, folder_uuid, uid); media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret); /*get filename*/ @@ -533,7 +531,7 @@ int media_svc_set_item_validity(const char *storage_id, const char *path, int va return MS_MEDIA_ERR_NONE; } -int media_svc_delete_item_by_path(sqlite3 *handle, const char *storage_id, const char *path, uid_t uid) +int media_svc_delete_item_by_path(sqlite3 *handle, bool is_direct, const char *storage_id, const char *path, uid_t uid) { int ret = MS_MEDIA_ERR_NONE; char thumb_path[MEDIA_SVC_PATHNAME_SIZE] = {0, }; @@ -556,7 +554,7 @@ int media_svc_delete_item_by_path(sqlite3 *handle, const char *storage_id, const media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret); /*Delete item*/ - ret = _media_svc_delete_item_by_path(storage_id, path, FALSE, uid); + ret = _media_svc_delete_item_by_path(is_direct, storage_id, path, FALSE, uid); if (ret != MS_MEDIA_ERR_NONE) { media_svc_error("_media_svc_delete_item_by_path failed : %d", ret); _media_svc_destroy_noti_item(noti_item); @@ -569,7 +567,7 @@ int media_svc_delete_item_by_path(sqlite3 *handle, const char *storage_id, const _media_svc_publish_noti(MS_MEDIA_ITEM_FILE, MS_MEDIA_ITEM_DELETE, path, media_type, noti_item->media_uuid, noti_item->mime_type); _media_svc_destroy_noti_item(noti_item); } else { - ret = _media_svc_delete_item_by_path(storage_id, path, TRUE, uid); + ret = _media_svc_delete_item_by_path(is_direct, storage_id, path, TRUE, uid); if (ret != MS_MEDIA_ERR_NONE) { media_svc_error("_media_svc_delete_item_by_path failed : %d", ret); return ret; @@ -646,7 +644,7 @@ int media_svc_refresh_item(sqlite3 *handle, const char *storage_id, ms_user_stor else if (media_type == MEDIA_SVC_MEDIA_TYPE_IMAGE) ret = _media_svc_extract_image_metadata(&content_info); else - ret = _media_svc_extract_media_metadata(handle, &content_info, uid); + ret = _media_svc_extract_media_metadata(handle, false, &content_info, uid); if (ret != MS_MEDIA_ERR_NONE) { _media_svc_destroy_noti_item(noti_item); @@ -954,7 +952,7 @@ int media_svc_insert_folder(sqlite3 *handle, const char *storage_id, ms_user_sto int media_svc_set_folder_validity(sqlite3 *handle, const char *storage_id, const char *start_path, int validity, bool is_recursive, uid_t uid) { - return _media_svc_set_folder_validity(handle, storage_id, start_path, validity, is_recursive, uid); + return _media_svc_set_folder_validity(handle, true, storage_id, start_path, validity, is_recursive, uid); } int media_svc_check_folder_exist_by_path(sqlite3 *handle, const char *storage_id, const char *folder_path) |