This commit is contained in:
parent
43df4356b6
commit
1fe3f62be4
@ -1016,8 +1016,11 @@ void file_manager::upload_completed(const file_upload_completed &evt) {
|
|||||||
unique_mutex_lock upload_lock(upload_mtx_);
|
unique_mutex_lock upload_lock(upload_mtx_);
|
||||||
|
|
||||||
if (not utils::string::to_bool(evt.get_cancelled().get<std::string>())) {
|
if (not utils::string::to_bool(evt.get_cancelled().get<std::string>())) {
|
||||||
|
|
||||||
auto err = api_error_from_string(evt.get_result().get<std::string>());
|
auto err = api_error_from_string(evt.get_result().get<std::string>());
|
||||||
if (err == api_error::success) {
|
if (err == api_error::success) {
|
||||||
|
upload_lookup_.erase(evt.get_api_path());
|
||||||
|
|
||||||
auto result =
|
auto result =
|
||||||
utils::db::sqlite::db_delete{*db_.get(), upload_active_table}
|
utils::db::sqlite::db_delete{*db_.get(), upload_active_table}
|
||||||
.where("api_path")
|
.where("api_path")
|
||||||
@ -1037,17 +1040,15 @@ void file_manager::upload_completed(const file_upload_completed &evt) {
|
|||||||
event_system::instance().raise<file_upload_not_found>(
|
event_system::instance().raise<file_upload_not_found>(
|
||||||
evt.get_api_path(), evt.get_source());
|
evt.get_api_path(), evt.get_source());
|
||||||
remove_upload(evt.get_api_path(), true);
|
remove_upload(evt.get_api_path(), true);
|
||||||
upload_notify_.notify_all();
|
} else {
|
||||||
return;
|
event_system::instance().raise<file_upload_retry>(
|
||||||
}
|
evt.get_api_path(), evt.get_source(), err);
|
||||||
|
|
||||||
event_system::instance().raise<file_upload_retry>(evt.get_api_path(),
|
upload_lookup_.erase(evt.get_api_path());
|
||||||
evt.get_source(), err);
|
|
||||||
queue_upload(evt.get_api_path(), evt.get_source(), true);
|
queue_upload(evt.get_api_path(), evt.get_source(), true);
|
||||||
upload_notify_.wait_for(upload_lock, 5s);
|
upload_notify_.wait_for(upload_lock, 5s);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
upload_lookup_.erase(evt.get_api_path());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
upload_notify_.notify_all();
|
upload_notify_.notify_all();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user