From 62a97d8eb63259f00354c146998f7652ff69f3ad Mon Sep 17 00:00:00 2001 From: levlam Date: Wed, 15 Jun 2022 21:40:23 +0300 Subject: [PATCH] Simplify FileLoadManager::get_content. --- td/telegram/files/FileLoadManager.cpp | 5 ++--- td/telegram/files/FileLoadManager.h | 2 +- td/telegram/files/FileManager.cpp | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/td/telegram/files/FileLoadManager.cpp b/td/telegram/files/FileLoadManager.cpp index 781653141..c2b1edf61 100644 --- a/td/telegram/files/FileLoadManager.cpp +++ b/td/telegram/files/FileLoadManager.cpp @@ -132,9 +132,8 @@ void FileLoadManager::from_bytes(QueryId id, FileType type, BufferSlice bytes, s CHECK(is_inserted); } -void FileLoadManager::get_content(const FullLocalFileLocation &local_location, Promise promise) { - // TODO: send query to other thread - promise.set_result(read_file(local_location.path_)); +void FileLoadManager::get_content(string file_path, Promise promise) { + promise.set_result(read_file(file_path)); } // void upload_reload_parts(QueryId id, vector parts); diff --git a/td/telegram/files/FileLoadManager.h b/td/telegram/files/FileLoadManager.h index 2cfd61d89..62de8cbd3 100644 --- a/td/telegram/files/FileLoadManager.h +++ b/td/telegram/files/FileLoadManager.h @@ -57,7 +57,7 @@ class FileLoadManager final : public Actor { void update_local_file_location(QueryId id, const LocalFileLocation &local); void update_downloaded_part(QueryId id, int64 offset, int64 limit); - void get_content(const FullLocalFileLocation &local_location, Promise promise); + void get_content(string file_path, Promise promise); private: struct Node { diff --git a/td/telegram/files/FileManager.cpp b/td/telegram/files/FileManager.cpp index ddf8e0182..aa21ed687 100644 --- a/td/telegram/files/FileManager.cpp +++ b/td/telegram/files/FileManager.cpp @@ -2054,7 +2054,7 @@ void FileManager::get_content(FileId file_id, Promise promise) { return promise.set_error(Status::Error("No local location")); } - send_closure(file_load_manager_, &FileLoadManager::get_content, node->local_.full(), std::move(promise)); + send_closure(file_load_manager_, &FileLoadManager::get_content, node->local_.full().path_, std::move(promise)); } void FileManager::read_file_part(FileId file_id, int64 offset, int64 count, int left_tries,