tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow to reupload file again after successful merge.

Browse Source 
GitOrigin-RevId: 46bc9d002f804fe6c39e1ba8844740141e0a6f9f
This commit is contained in:
levlam 2020-04-10 03:43:35 +03:00
parent b3594169b5
commit ba5e5f0ece
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
td/telegram/files/FileManager.cpp
View File

@ -1401,6 +1401,11 @@ Result<FileId> FileManager::merge(FileId x_file_id, FileId y_file_id, bool no_sy
LOG(ERROR) << "File remote location was changed from " << y_node->remote_.full.value() << " to " LOG(ERROR) << "File remote location was changed from " << y_node->remote_.full.value() << " to "
<< x_node->remote_.full.value(); << x_node->remote_.full.value();
} }
bool drop_last_successful_force_reupload_time = x_node->last_successful_force_reupload_time_ <= 0 &&
x_node->remote_.full &&
x_node->remote_.full_source == FileLocationSource::FromServer;
auto count_local = [](auto &node) { auto count_local = [](auto &node) {
return std::accumulate(node->file_ids_.begin(), node->file_ids_.end(), 0, return std::accumulate(node->file_ids_.begin(), node->file_ids_.end(), 0,
[](const auto &x, const auto &y) { return x + (y.get_remote() != 0); }); [](const auto &x, const auto &y) { return x + (y.get_remote() != 0); });
@ -1549,7 +1554,9 @@ Result<FileId> FileManager::merge(FileId x_file_id, FileId y_file_id, bool no_sy
node->need_load_from_pmc_ |= other_node->need_load_from_pmc_; node->need_load_from_pmc_ |= other_node->need_load_from_pmc_;
node->can_search_locally_ &= other_node->can_search_locally_; node->can_search_locally_ &= other_node->can_search_locally_;
if (other_node->last_successful_force_reupload_time_ > node->last_successful_force_reupload_time_) { if (drop_last_successful_force_reupload_time) {
node->last_successful_force_reupload_time_ = -1e10;
} else if (other_node->last_successful_force_reupload_time_ > node->last_successful_force_reupload_time_) {
node->last_successful_force_reupload_time_ = other_node->last_successful_force_reupload_time_; node->last_successful_force_reupload_time_ = other_node->last_successful_force_reupload_time_;
} }

2
td/telegram/files/FileManager.h
View File

@ -57,7 +57,7 @@ struct NewRemoteFileLocation {
unique_ptr<PartialRemoteFileLocation> partial; unique_ptr<PartialRemoteFileLocation> partial;
//TODO: use RemoteId //TODO: use RemoteId
// hardest part is to determine wether we should flush this location to db. // hardest part is to determine whether we should flush this location to db.
// probably, will need some generation in RemoteInfo // probably, will need some generation in RemoteInfo
optional<FullRemoteFileLocation> full; optional<FullRemoteFileLocation> full;
bool is_full_alive{false}; // if false, then we may try to upload this file bool is_full_alive{false}; // if false, then we may try to upload this file