X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmedia_content.c;h=8d20d33fb03d3e30000ef5ce42fa1e91f9f3dfa3;hb=91d04a3ff55b3f24d25ba989b12e2cc67639fb64;hp=15739a38082016f1d3e064fff3dae6d10c8ae0f4;hpb=323c1d4fff03eb0cdf841ff3494d723de4578177;p=platform%2Fcore%2Fapi%2Fmedia-content.git diff --git a/src/media_content.c b/src/media_content.c index 15739a3..8d20d33 100644 --- a/src/media_content.c +++ b/src/media_content.c @@ -36,20 +36,24 @@ uid_t _content_get_uid(void) return content_g_uid; } -int _content_query_prepare(char *select_query, char *condition_query, char *option_query, sqlite3_stmt **stmt) +int _content_query_prepare(const char *select_query, const char *condition_query, const char *option_query, sqlite3_stmt **stmt) { int ret = MEDIA_CONTENT_ERROR_NONE; char *query = NULL; - media_content_retvm_if(!STRING_VALID(select_query), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid select_query"); + content_retip_if_fail(select_query); - if (!STRING_VALID(condition_query)) - condition_query = (char *)" "; + /* If 'option_query' is NULL, 'condition_query' is also NULL. */ + if (option_query) { + if (STRING_VALID(condition_query)) + query = sqlite3_mprintf("%s AND %s %s", select_query, condition_query, option_query); + else + query = sqlite3_mprintf("%s %s", select_query, option_query); - if (!STRING_VALID(option_query)) - option_query = (char *)" "; + } else { + query = sqlite3_mprintf("%s", select_query); + } - query = sqlite3_mprintf("%s %s %s", select_query, condition_query, option_query); ret = _content_get_result(query, stmt); SQLITE3_SAFE_FREE(query); @@ -60,14 +64,14 @@ int _content_get_result(char *query, sqlite3_stmt **stmt) { int err = MEDIA_CONTENT_ERROR_NONE; - media_content_retvm_if(_content_get_db_handle() == NULL, MEDIA_CONTENT_ERROR_DB_FAILED, "database is not connected"); - media_content_retvm_if(!STRING_VALID(query), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid query"); + content_retip_if_fail(_content_get_db_handle()); + content_retip_if_fail(query); - media_content_sec_debug("Query[%s]", query); + content_sec_debug("Query[%s]", query); err = sqlite3_prepare_v2(_content_get_db_handle(), query, strlen(query), stmt, NULL); if (err != SQLITE_OK) { - media_content_error("Failed to sqlite3_prepare_v2[%s]", sqlite3_errmsg(_content_get_db_handle())); + content_error("Failed to sqlite3_prepare_v2[%s]", sqlite3_errmsg(_content_get_db_handle())); if (err == SQLITE_BUSY) return MEDIA_CONTENT_ERROR_DB_BUSY; else if (err == SQLITE_PERM) @@ -79,100 +83,37 @@ int _content_get_result(char *query, sqlite3_stmt **stmt) return MEDIA_CONTENT_ERROR_NONE; } -#ifdef _USE_SENIOR_MODE -int _content_query_prepare_by_union_select(sqlite3_stmt **stmt, char *select_query1, char *condition_query1, char *option_query1, char *select_query2, char *condition_query2, char *option_query2) +int _content_error_capi(int internal_error) { - int len = 0; - int err = MEDIA_CONTENT_ERROR_NONE; - char query[MAX_QUERY_SIZE] = {0, }; - memset(query, '\0', sizeof(query)); - - media_content_retvm_if(_content_get_db_handle() == NULL, MEDIA_CONTENT_ERROR_DB_FAILED, "database is not connected"); - media_content_retvm_if(!STRING_VALID(select_query1), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid select_query1"); - media_content_retvm_if(!STRING_VALID(select_query2), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid select_query2"); - - if (!STRING_VALID(condition_query1)) - condition_query1 = (char *)" "; - - if (!STRING_VALID(option_query1)) - option_query1 = (char *)" "; - - if (!STRING_VALID(condition_query2)) - condition_query2 = (char *)" "; - - if (!STRING_VALID(option_query2)) - option_query2 = (char *)" "; - - len = snprintf(query, sizeof(query), "SELECT * FROM (%s %s %s) as table1 UNION ALL SELECT * FROM (%s %s %s) as table2", - select_query1, condition_query1, option_query1, select_query2, condition_query2, option_query2); - if (len > 0 && len < sizeof(query)) { - query[len] = '\0'; - } else if (len >= sizeof(query)) { - query[MAX_QUERY_SIZE -1] = '\0'; - } else { - media_content_error("snprintf failed"); - return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; - } - - media_content_sec_debug("Query : [%s]", query); - - err = sqlite3_prepare_v2(_content_get_db_handle(), query, strlen(query), stmt, NULL); - if (err != SQLITE_OK) { - media_content_error("DB_FAILED(0x%08x) fail to sqlite3_prepare(), %s", MEDIA_CONTENT_ERROR_DB_FAILED, sqlite3_errmsg(_content_get_db_handle())); - - if (err == SQLITE_BUSY) { - media_content_error(" BUSY ERROR"); - return MEDIA_CONTENT_ERROR_DB_BUSY; - } else if (err == SQLITE_PERM) { - media_content_error("PERMISSION EROR"); - return MEDIA_CONTENT_ERROR_PERMISSION_DENIED; - } else { - media_content_error("OTHER ERROR"); - return MEDIA_CONTENT_ERROR_DB_FAILED; - } - } - - return MEDIA_CONTENT_ERROR_NONE; -} -#endif - -int _content_error_capi(int content_error) -{ - if (content_error != MEDIA_CONTENT_ERROR_NONE) - media_content_error("MS Error[%d]", content_error); - - /*Error None*/ - if (content_error == MS_MEDIA_ERR_NONE) + if (internal_error == MS_MEDIA_ERR_NONE) return MEDIA_CONTENT_ERROR_NONE; - /* Internal operation error*/ - else if (content_error == MS_MEDIA_ERR_INVALID_PARAMETER) - return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; + content_error("MS Error[%d]", internal_error); - else if (content_error == MS_MEDIA_ERR_OUT_OF_MEMORY) + switch (internal_error) { + case MS_MEDIA_ERR_INVALID_PARAMETER: + return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; + case MS_MEDIA_ERR_OUT_OF_MEMORY: return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY; - - /* DB operation error*/ - else if (content_error == MS_MEDIA_ERR_DB_BUSY_FAIL) + case MS_MEDIA_ERR_DB_BUSY_FAIL: return MEDIA_CONTENT_ERROR_DB_BUSY; - - else if ((content_error <= MS_MEDIA_ERR_DB_CONSTRAINT_FAIL) && (content_error >= MS_MEDIA_ERR_DB_INTERNAL)) + case MS_MEDIA_ERR_DB_CONSTRAINT_FAIL: + case MS_MEDIA_ERR_DB_NO_RECORD: + case MS_MEDIA_ERR_DB_CORRUPT: + case MS_MEDIA_ERR_DB_FULL_FAIL: + case MS_MEDIA_ERR_DB_RESET: + case MS_MEDIA_ERR_DB_INTERNAL: return MEDIA_CONTENT_ERROR_DB_FAILED; - - /* IPC operation error*/ - else if (content_error == MS_MEDIA_ERR_IPC) + case MS_MEDIA_ERR_IPC: return MEDIA_CONTENT_ERROR_NETWORK; - - /* MEDIA SERVER error*/ - else if (content_error == MS_MEDIA_ERR_PERMISSION_DENIED) + case MS_MEDIA_ERR_PERMISSION_DENIED: return MEDIA_CONTENT_ERROR_PERMISSION_DENIED; - - /* Thumbnail error*/ - else if ((content_error == MS_MEDIA_ERR_THUMB_TOO_BIG) || (content_error == MS_MEDIA_ERR_THUMB_UNSUPPORTED)) - return MEDIA_CONTENT_ERROR_UNSUPPORTED_CONTENT; - - /*ETC*/ - return MEDIA_CONTENT_ERROR_INVALID_OPERATION; + case MS_MEDIA_ERR_THUMB_TOO_BIG: + case MS_MEDIA_ERR_THUMB_UNSUPPORTED: + return MEDIA_CONTENT_ERROR_UNSUPPORTED_CONTENT; + default: + return MEDIA_CONTENT_ERROR_INVALID_OPERATION; + } } int _content_query_sql(char *query_str) @@ -190,7 +131,7 @@ int media_content_connect(void) int ret = MEDIA_CONTENT_ERROR_NONE; g_mutex_lock(&db_mutex); - media_content_info("ref count : %d", ref_count); + content_info("ref count : %d", ref_count); if (ref_count == 0) { if (db_handle == NULL) { @@ -199,19 +140,19 @@ int media_content_connect(void) if (ret == MEDIA_CONTENT_ERROR_NONE) ref_count++; } else { - media_content_error("Wrong DB Connection status"); + content_error("Wrong DB Connection status"); ret = MEDIA_CONTENT_ERROR_DB_FAILED; } } else { if (db_handle != NULL) { ref_count++; } else { - media_content_error("Wrong DB Handle status"); + content_error("Wrong DB Handle status"); ret = MEDIA_CONTENT_ERROR_DB_FAILED; } } - media_content_info("ref count changed to: %d", ref_count); + content_info("ref count changed to: %d", ref_count); g_mutex_unlock(&db_mutex); return ret; @@ -219,7 +160,7 @@ int media_content_connect(void) int media_content_connect_with_uid(uid_t uid) { - media_content_sec_debug("media_content_connect_with_uid [%d]", uid); + content_sec_debug("media_content_connect_with_uid [%d]", uid); content_g_uid = uid; return media_content_connect(); @@ -228,7 +169,7 @@ int media_content_connect_with_uid(uid_t uid) int media_content_disconnect(void) { g_mutex_lock(&db_mutex); - media_content_debug("ref count : %d", ref_count); + content_debug("ref count : %d", ref_count); if (db_handle && ref_count > 0) { if (--ref_count == 0) { @@ -236,14 +177,14 @@ int media_content_disconnect(void) db_handle = NULL; } } else { - media_content_error("Database is not connected"); + content_error("Database is not connected"); g_mutex_unlock(&db_mutex); return MEDIA_CONTENT_ERROR_DB_FAILED; } g_mutex_unlock(&db_mutex); - media_content_info("ref count changed to: %d", ref_count); + content_info("ref count changed to: %d", ref_count); return MEDIA_CONTENT_ERROR_NONE; } @@ -251,89 +192,84 @@ int media_content_disconnect(void) int media_content_scan_file(const char *path) { int ret = MEDIA_CONTENT_ERROR_NONE; - bool ignore_file = FALSE; - bool ignore_dir = FALSE; char *folder_path = NULL; int check_file = MEDIA_CONTENT_ERROR_NONE; char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0,}; - char repl_path[MAX_PATH_LEN] = {0,}; - - media_content_retvm_if(!STRING_VALID(path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid path"); - media_content_sec_debug("Path : %s", path); + content_retip_if_fail(STRING_VALID(path)); - memset(repl_path, 0, sizeof(repl_path)); - ret = _media_content_replace_path(path, repl_path); - media_content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed"); + content_sec_debug("Path : %s", path); - ret = _media_util_check_ignore_file(repl_path, &ignore_file); - media_content_retvm_if(ignore_file == TRUE, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid path"); + content_retvm_if(_media_util_is_ignorable_file(path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid path"); - memset(storage_id, 0x00, sizeof(storage_id)); - ret = media_svc_get_storage_id(_content_get_db_handle(), repl_path, storage_id, _content_get_uid()); + ret = media_svc_get_storage_id(_content_get_db_handle(), path, storage_id, _content_get_uid()); if (ret != MS_MEDIA_ERR_NONE) { - media_content_error("media_svc_get_storage_id failed : %d", ret); + content_error("media_svc_get_storage_id failed : %d", ret); return _content_error_capi(ret); } - check_file = _media_util_check_file_exist(repl_path); + check_file = _media_util_check_file_exist(path); if (check_file == MEDIA_CONTENT_ERROR_NONE) { /* This means this path has to be inserted or refreshed */ - folder_path = g_path_get_dirname(repl_path); - ret = _media_util_check_ignore_dir(folder_path, &ignore_dir); - SAFE_FREE(folder_path); + folder_path = g_path_get_dirname(path); + + if (_media_util_is_ignorable_dir(folder_path)) { + g_free(folder_path); + return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; + } + + g_free(folder_path); - media_content_retvm_if(ignore_dir == TRUE, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid folder path"); /* check feature */ - media_content_retvm_if(!_media_util_check_support_media_type(repl_path), MEDIA_CONTENT_ERROR_NOT_SUPPORTED, "Unsupported media type"); + content_retvm_if(!_media_util_check_support_media_type(path), MEDIA_CONTENT_ERROR_NOT_SUPPORTED, "Unsupported media type"); ms_user_storage_type_e storage_type; - ret = ms_user_get_storage_type(_content_get_uid(), repl_path, &storage_type); + ret = ms_user_get_storage_type(_content_get_uid(), path, &storage_type); if (ret != MS_MEDIA_ERR_NONE) { - media_content_sec_error("ms_user_get_storage_type failed : %d (%s)", ret, repl_path); + content_sec_error("ms_user_get_storage_type failed : %d (%s)", ret, path); return _content_error_capi(ret); } - ret = media_svc_check_item_exist_by_path(_content_get_db_handle(), storage_id, repl_path); + ret = media_svc_check_item_exist_by_path(_content_get_db_handle(), storage_id, path); if (ret == MS_MEDIA_ERR_NONE) { /* Refresh */ - ret = media_svc_refresh_item(_content_get_db_handle(), false, storage_id, storage_type, repl_path, _content_get_uid()); + ret = media_svc_refresh_item(_content_get_db_handle(), false, storage_id, storage_type, path, _content_get_uid()); if (ret != MS_MEDIA_ERR_NONE) { - media_content_error("media_svc_refresh_item failed : %d", ret); + content_error("media_svc_refresh_item failed : %d", ret); return _content_error_capi(ret); } } else if (ret == MS_MEDIA_ERR_DB_NO_RECORD) { /* Insert */ - ret = media_svc_insert_item_immediately(_content_get_db_handle(), storage_id, storage_type, repl_path, _content_get_uid()); + ret = media_svc_insert_item_immediately(_content_get_db_handle(), storage_id, storage_type, path, _content_get_uid()); if (ret != MS_MEDIA_ERR_NONE) { if (ret == MS_MEDIA_ERR_DB_CONSTRAINT_FAIL) { - media_content_sec_error("This item is already inserted. This may be normal operation because other process already did this (%s)", repl_path); + content_sec_error("This item is already inserted. This may be normal operation because other process already did this (%s)", path); ret = MEDIA_CONTENT_ERROR_NONE; } else { - media_content_sec_error("media_svc_insert_item_immediately failed : %d (%s)", ret, repl_path); + content_sec_error("media_svc_insert_item_immediately failed : %d (%s)", ret, path); } return _content_error_capi(ret); } } else { - media_content_error("media_svc_check_item_exist_by_path failed : %d", ret); + content_error("media_svc_check_item_exist_by_path failed : %d", ret); return _content_error_capi(ret); } } else if (check_file == MEDIA_CONTENT_ERROR_PERMISSION_DENIED) { - media_content_error("You have no permission for this file %d", ret); + content_error("You have no permission for this file %d", ret); return MEDIA_CONTENT_ERROR_PERMISSION_DENIED; } else { /* This means this path has to be deleted */ - media_content_debug("This path doesn't exists in file system... So now start to delete it from DB"); - ret = media_svc_delete_item_by_path(_content_get_db_handle(), storage_id, repl_path, _content_get_uid()); + content_debug("This path doesn't exists in file system... So now start to delete it from DB"); + ret = media_svc_delete_item_by_path(_content_get_db_handle(), storage_id, path, _content_get_uid()); if (ret != MS_MEDIA_ERR_NONE) { if (ret == MS_MEDIA_ERR_DB_NO_RECORD) { - media_content_error("Does not exist in media DB also... So, this is an invalid parameter"); + content_error("Does not exist in media DB also... So, this is an invalid parameter"); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } - media_content_error("media_svc_delete_item_by_path failed : %d", ret); + content_error("media_svc_delete_item_by_path failed : %d", ret); return _content_error_capi(ret); } } @@ -352,20 +288,20 @@ void _media_content_scan_cb(media_request_result_s* result, void *user_data) result->request_type != MEDIA_REQUEST_SCAN_PARTIAL && result->request_type != MEDIA_RECURSIVE_START) { if (cb_data && cb_data->callback) { - media_content_debug("begin:User callback is being called now, result=%d", err); + content_debug("begin:User callback is being called now, result=%d", err); cb_data->callback(err, cb_data->user_data); - media_content_debug("end:User callback is being called now, result=%d", err); + content_debug("end:User callback is being called now, result=%d", err); } - SAFE_FREE(cb_data); + g_free(cb_data); } #else if (cb_data && cb_data->callback) { - media_content_debug("User callback is being called now"); + content_debug("User callback is being called now"); cb_data->callback(err, cb_data->user_data); } - SAFE_FREE(cb_data); + g_free(cb_data); #endif return; @@ -378,9 +314,9 @@ void _media_content_scan_cb_v2(media_request_result_s* result, void *user_data) media_content_scan_cb_data_v2 *cb_data = user_data; media_content_complete_phase_e complete_phase = -1; if (!cb_data) - media_content_debug("cb_data is NULL"); + content_debug("cb_data is NULL"); err = _content_error_capi(result->result); - media_content_debug("result is %d", err); + content_debug("result is %d", err); if (result->request_type == MEDIA_REQUEST_SCAN_PARTIAL) complete_phase = MEDIA_CONTENT_SCAN_PARTIAL_COMPLETE; @@ -394,12 +330,12 @@ void _media_content_scan_cb_v2(media_request_result_s* result, void *user_data) if (cb_data && cb_data->callback) cb_data->callback(err, complete_phase, cb_data->user_data); else - media_content_debug("run error"); + content_debug("run error"); if ((result->request_type != MEDIA_REQUEST_SCAN_COMPLETE) && (result->request_type != MEDIA_REQUEST_SCAN_PARTIAL) && (result->request_type != MEDIA_RECURSIVE_START)) - SAFE_FREE(cb_data); + g_free(cb_data); return; } @@ -408,54 +344,46 @@ void _media_content_scan_cb_v2(media_request_result_s* result, void *user_data) int media_content_scan_folder(const char *path, bool is_recursive, media_scan_completed_cb callback, void *user_data) { int ret = MEDIA_CONTENT_ERROR_NONE; - bool ignore_dir = FALSE; char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0, }; - char repl_path[MAX_PATH_LEN] = {0, }; ms_user_storage_type_e storage_type = MS_USER_STORAGE_INTERNAL; - media_content_retvm_if(!STRING_VALID(path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid path"); - memset(repl_path, 0, sizeof(repl_path)); - ret = _media_content_replace_path(path, repl_path); - media_content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed"); - - memset(storage_id, 0x00, sizeof(storage_id)); + content_retip_if_fail(STRING_VALID(path)); + content_retip_if_fail(callback); - ret = _media_content_check_dir(repl_path); - media_content_retvm_if(ret == MEDIA_CONTENT_ERROR_PERMISSION_DENIED, ret, "Permission Denied"); + ret = _media_content_check_dir(path); + content_retvm_if(ret == MEDIA_CONTENT_ERROR_PERMISSION_DENIED, ret, "Permission Denied"); if (ret == MEDIA_CONTENT_ERROR_NONE) { /* If directory exist check that's ignore directory or not*/ - ret = _media_util_check_ignore_dir(repl_path, &ignore_dir); - media_content_retvm_if((ignore_dir == TRUE || ret != MEDIA_CONTENT_ERROR_NONE), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid folder path"); + content_retvm_if(_media_util_is_ignorable_dir(path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid folder path"); } else { /* This means this folder has to be deleted */ /* Or, it is real invalid path.. check storage type */ - ret = ms_user_get_storage_type(_content_get_uid(), repl_path, &storage_type); + ret = ms_user_get_storage_type(_content_get_uid(), path, &storage_type); if (ret != MS_MEDIA_ERR_NONE) { - media_content_sec_error("ms_user_get_storage_type failed : %d (%s)", ret, repl_path); + content_sec_error("ms_user_get_storage_type failed : %d (%s)", ret, path); return _content_error_capi(ret); } - media_content_debug("This path doesn't exists in file system... So will be deleted it from DB"); + content_debug("This path doesn't exists in file system... So will be deleted it from DB"); } - ret = media_svc_get_storage_id(_content_get_db_handle(), repl_path, storage_id, _content_get_uid()); + ret = media_svc_get_storage_id(_content_get_db_handle(), path, storage_id, _content_get_uid()); if (ret != MS_MEDIA_ERR_NONE) { - media_content_error("media_svc_get_storage_id failed : %d", ret); + content_error("media_svc_get_storage_id failed : %d", ret); return _content_error_capi(ret); } media_content_scan_cb_data *cb_data = NULL; - cb_data = (media_content_scan_cb_data *)malloc(sizeof(media_content_scan_cb_data)); - media_content_retvm_if(cb_data == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); + cb_data = g_new0(media_content_scan_cb_data, 1); cb_data->callback = callback; cb_data->user_data = user_data; - ret = media_directory_scanning_async(repl_path, storage_id, is_recursive, _media_content_scan_cb, cb_data, _content_get_uid()); + ret = media_directory_scanning_async(path, storage_id, is_recursive, _media_content_scan_cb, cb_data, _content_get_uid()); if (ret != MS_MEDIA_ERR_NONE) { - media_content_error("media_directory_scanning_async failed : %d", ret); - SAFE_FREE(cb_data); + content_error("media_directory_scanning_async failed : %d", ret); + g_free(cb_data); } return _content_error_capi(ret); @@ -465,22 +393,19 @@ int media_content_scan_folder(const char *path, bool is_recursive, media_scan_co int media_content_scan_folder_v2(const char *path, bool is_recursive, media_scan_completed_cb_v2 callback, void *user_data) { int ret = MEDIA_CONTENT_ERROR_NONE; - bool ignore_dir = FALSE; char storage_id[MEDIA_CONTENT_UUID_SIZE+1] = {0, }; - media_content_retvm_if(!STRING_VALID(path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid path"); - memset(storage_id, 0x00, sizeof(storage_id)); + content_retip_if_fail(STRING_VALID(path)); + content_retip_if_fail(callback); - ret = _media_util_check_ignore_dir(path, &ignore_dir); - media_content_retvm_if(ignore_dir, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid folder path"); + content_retvm_if(_media_util_is_ignorable_dir(path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid folder path"); ret = _media_content_check_dir(path); - media_content_retvm_if(ret == MEDIA_CONTENT_ERROR_PERMISSION_DENIED, ret, "Permission Denied"); - media_content_retvm_if(ret == MEDIA_CONTENT_ERROR_INVALID_PARAMETER, ret, "invalid path[%s]", path); + content_retvm_if(ret == MEDIA_CONTENT_ERROR_PERMISSION_DENIED, ret, "Permission Denied"); + content_retvm_if(ret == MEDIA_CONTENT_ERROR_INVALID_PARAMETER, ret, "invalid path[%s]", path); media_content_scan_cb_data_v2* cb_data = NULL; - cb_data = (media_content_scan_cb_data_v2*)malloc(sizeof(media_content_scan_cb_data_v2)); - media_content_retvm_if(cb_data == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY"); + cb_data = g_new0(media_content_scan_cb_data_v2, 1); cb_data->callback = callback; cb_data->user_data = user_data; @@ -490,7 +415,7 @@ int media_content_scan_folder_v2(const char *path, bool is_recursive, media_scan ret = media_directory_scanning_async(path, storage_id, is_recursive, _media_content_scan_cb_v2, cb_data, _content_get_uid()); if (ret != MS_MEDIA_ERR_NONE) - media_content_error("media_directory_scanning_async failed : %d", ret); + content_error("media_directory_scanning_async failed : %d", ret); return _content_error_capi(ret); } @@ -499,17 +424,12 @@ int media_content_scan_folder_v2(const char *path, bool is_recursive, media_scan int media_content_cancel_scan_folder(const char *path) { int ret = MEDIA_CONTENT_ERROR_NONE; - char repl_path[MAX_PATH_LEN] = {0, }; - - media_content_retvm_if(!STRING_VALID(path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid path"); - memset(repl_path, 0, sizeof(repl_path)); - ret = _media_content_replace_path(path, repl_path); - media_content_retvm_if(!STRING_VALID(repl_path), MEDIA_CONTENT_ERROR_INVALID_OPERATION, "path replacement failed"); + content_retip_if_fail(STRING_VALID(path)); - ret = media_directory_scanning_cancel(repl_path, _content_get_uid()); + ret = media_directory_scanning_cancel(path, _content_get_uid()); if (ret != MS_MEDIA_ERR_NONE) - media_content_error("media_directory_scanning_async failed : %d", ret); + content_error("media_directory_scanning_async failed : %d", ret); return _content_error_capi(ret); } @@ -544,18 +464,17 @@ int media_content_add_db_updated_cb(media_content_db_update_cb callback, void *u int ret = MEDIA_CONTENT_ERROR_NONE; media_noti_cb_s *noti_info = NULL; - media_content_retvm_if(noti_handle == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "handle is NULL"); - media_content_retvm_if(callback == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "callback is NULL"); + content_retip_if_fail(callback); + content_retip_if_fail(noti_handle); - noti_info = (media_noti_cb_s *)calloc(1, sizeof(media_noti_cb_s)); - media_content_retvm_if(noti_info == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "Failed to create noti info"); + noti_info = g_new0(media_noti_cb_s, 1); noti_info->update_noti_cb = callback; noti_info->user_data = user_data; - ret = media_db_update_subscribe_internal((MediaNotiHandle*)noti_handle, _media_content_db_update_noti_cb, (void *)noti_info); + ret = media_db_update_subscribe((MediaNotiHandle*)noti_handle, _media_content_db_update_noti_cb, (void *)noti_info); if (ret != MS_MEDIA_ERR_NONE) - SAFE_FREE(noti_info); + g_free(noti_info); return _content_error_capi(ret); } @@ -563,26 +482,17 @@ int media_content_add_db_updated_cb(media_content_db_update_cb callback, void *u #ifdef TIZEN_FEATURE_COMPATIBILITY int media_content_set_db_updated_cb(media_content_db_update_cb callback, void *user_data) { - media_content_warn("DEPRECATION WARNING: media_content_set_db_updated_cb() is removed from 5.0."); + content_warn("DEPRECATION WARNING: media_content_set_db_updated_cb() is removed from 5.0."); return MEDIA_CONTENT_ERROR_NONE; } #endif -void __media_content_clear_user_data(void *user_data) -{ - media_noti_cb_s *noti_info = user_data; - - SAFE_FREE(noti_info); - - return; -} - int media_content_remove_db_updated_cb(media_content_noti_h noti_handle) { int ret = MEDIA_CONTENT_ERROR_NONE; - ret = media_db_update_unsubscribe_internal((MediaNotiHandle)noti_handle, __media_content_clear_user_data); + ret = media_db_update_unsubscribe((MediaNotiHandle)noti_handle); return _content_error_capi(ret); }