andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

A lot of file reference fixes.

Browse Source 
GitOrigin-RevId: cfe82f1ea2f6fda7d5c63eb7f19e411fe5df61ff
This commit is contained in:
levlam 2019-02-10 02:39:58 +03:00
parent 3db62de13b
commit b7b5fc0f06
4 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
td/telegram/DocumentsManager.cpp
View File

@ -438,7 +438,10 @@ bool DocumentsManager::has_input_media(FileId file_id, FileId thumbnail_file_id,
if (file_view.is_encrypted()) {
return false;
}
return file_view.has_remote_location() || file_view.has_url();
// having remote location is not enough to have InputMedia, because the file may not have valid file_reference
// also file_id needs to be duped, because upload can be called to repair the file_reference and every upload
// request must have unique file_id
return /* file_view.has_remote_location() || */ file_view.has_url();
}
}
@ -559,7 +562,7 @@ bool DocumentsManager::merge_documents(FileId new_id, FileId old_id, bool can_de
CHECK(new_ != nullptr);
if (old_->thumbnail != new_->thumbnail) {
// LOG_STATUS(td_->file_manager_->merge(new_->thumbnail.file_id, old_->thumbnail.file_id));
// LOG_STATUS(td_->file_manager_->merge(new_->thumbnail.file_id, old_->thumbnail.file_id));
}
new_->is_changed = true;

1
td/telegram/MessagesManager.cpp
View File

@ -15378,6 +15378,7 @@ void MessagesManager::do_send_message(DialogId dialog_id, Message *m, vector<int
FileId file_id = get_message_content_file_id(content);
FileView file_view = td_->file_manager_->get_file_view(file_id);
FileId thumbnail_file_id = get_message_content_thumbnail_file_id(content, td_);
LOG(DEBUG) << "Need to send file " << file_id << " with thumbnail " << thumbnail_file_id;
if (is_secret) {
auto layer = td_->contacts_manager_->get_secret_chat_layer(dialog_id.get_secret_chat_id());
auto secret_input_media = get_secret_input_media(content, td_, nullptr, BufferSlice(), layer);

2
td/telegram/Photo.cpp
View File

@ -551,7 +551,7 @@ bool photo_has_input_media(FileManager *file_manager, const Photo &photo, bool i
if (file_view.is_encrypted()) {
return false;
}
return file_view.has_remote_location() || file_view.has_url();
return /* file_view.has_remote_location() || */ file_view.has_url();
}
}

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

@ -772,7 +772,7 @@ FileId FileManager::dup_file_id(FileId file_id) {
if (!file_node) {
return FileId();
}
auto result = create_file_id(file_node_id, file_node);
auto result = FileId(create_file_id(file_node_id, file_node).get(), file_id.get_remote());
LOG(INFO) << "Dup file " << file_id << " to " << result;
return result;
}
@ -2110,6 +2110,8 @@ void FileManager::run_upload(FileNodePtr node, std::vector<int> bad_parts) {
if (old_priority != 0) {
LOG(INFO) << "Cancel file " << file_id << " uploading";
do_cancel_upload(node);
} else {
LOG(INFO) << "File " << file_id << " upload priority is still 0";
}
return;
}
@ -2146,10 +2148,10 @@ void FileManager::run_upload(FileNodePtr node, std::vector<int> bad_parts) {
node->upload_id_ = id;
node->upload_was_update_file_reference_ = true;
context_->repair_file_reference(file_id, PromiseCreator::lambda([id, actor_id = actor_id(this)](Result<Unit> res) {
send_closure(actor_id, &FileManager::on_error, id,
Status::Error("FILE_UPLOAD_RESTART_WITH_FILE_REFERENCE"));
}));
context_->repair_file_reference(
node->main_file_id_, PromiseCreator::lambda([id, actor_id = actor_id(this)](Result<Unit> res) {
send_closure(actor_id, &FileManager::on_error, id, Status::Error("FILE_UPLOAD_RESTART_WITH_FILE_REFERENCE"));
}));
return;
}
@ -2912,11 +2914,12 @@ void FileManager::on_error_impl(FileNodePtr node, FileManager::Query::Type type,
try_flush_node(node, "on_error");
};
if (status.code() != 1 && !G()->close_flag()) {
LOG(WARNING) << "Failed to upload/download/generate file: " << status << ". Query type = " << type
<< ". File type is " << FileView(node).get_type();
LOG(WARNING) << "Failed to upload/download/generate file " << node->main_file_id_ << ": " << status
<< ". Query type = " << type << ". File type is " << FileView(node).get_type();
if (status.code() == 0) {
// Remove partial locations
if (node->local_.type() == LocalFileLocation::Type::Partial && status.message() != "FILE_UPLOAD_RESTART") {
if (node->local_.type() == LocalFileLocation::Type::Partial &&
!begins_with(status.message(), "FILE_UPLOAD_RESTART")) {
CSlice path = node->local_.partial().path_;
if (begins_with(path, get_files_temp_dir(FileType::Encrypted)) ||
begins_with(path, get_files_temp_dir(FileType::Video))) {
@ -2945,8 +2948,9 @@ void FileManager::on_error_impl(FileNodePtr node, FileManager::Query::Type type,
return;
}
LOG(WARNING) << "Failed to upload file: unexpected " << status << ", is_small = " << has_partial_small_location
<< ", should_be_big = " << should_be_big_location << ", expected size = " << expected_size;
LOG(WARNING) << "Failed to upload file " << node->main_file_id_ << ": unexpected " << status
<< ", is_small = " << has_partial_small_location << ", should_be_big = " << should_be_big_location
<< ", expected size = " << expected_size;
}
if (begins_with(status.message(), "FILE_GENERATE_LOCATION_INVALID")) {
@ -2972,7 +2976,7 @@ void FileManager::on_error_impl(FileNodePtr node, FileManager::Query::Type type,
return;
}
if (status.message() == "FILE_UPLOAD_RESTART") {
if (begins_with(status.message(), "FILE_UPLOAD_RESTART")) {
if (ends_with(status.message(), "WITH_FILE_REFERENCE")) {
node->upload_was_update_file_reference_ = true;
}