From dd5b8a87c21aac438b0acebddc1adf4ca6555da1 Mon Sep 17 00:00:00 2001 From: levlam Date: Fri, 28 Dec 2018 20:38:37 +0300 Subject: [PATCH] Remove separate setFileDownloadOffset. GitOrigin-RevId: b9588dbbc3929de9dba01c008bc18d1f36b24571 --- td/generate/scheme/td_api.tl | 3 --- td/generate/scheme/td_api.tlo | Bin 139808 -> 139680 bytes td/telegram/Td.cpp | 13 ------------- td/telegram/Td.h | 2 -- td/telegram/cli.cpp | 6 ------ td/telegram/files/FileManager.cpp | 12 ------------ td/telegram/files/FileManager.h | 1 - 7 files changed, 37 deletions(-) diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl index f0a29fa0..28507638 100644 --- a/td/generate/scheme/td_api.tl +++ b/td/generate/scheme/td_api.tl @@ -2952,9 +2952,6 @@ setPinnedChats chat_ids:vector = Ok; //@offset File will be downloaded starting from that offset in bytes first. Supposed to be used for streaming downloadFile file_id:int32 priority:int32 offset:int32 = File; -//@description Sets offset for file downloading @file_id Identifier of the file to change download offset @offset New file download offset -setFileDownloadOffset file_id:int32 offset:int32 = File; - //@description Returns file downloaded prefix size from a given offset @file_id Identifier of the file @offset Offset from which downloaded prefix size should be calculated getFileDownloadedPrefixSize file_id:int32 offset:int32 = Count; diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo index 4c98d067cb9b928ee35e699a7f204b4e735397e9..56ec7a1bd6c5ef3cef32092674b6fbce72be0e69 100644 GIT binary patch delta 25 hcmZ2*gk!;Bj)pCaXIdETx1Vic6mQ<1!ojph5&)6>3OWD) delta 72 zcmZ2*m}9{aj)pCaXIdB?wx4Zb6mM48tu<@5XmM(ZTV_tGOMZD?PJUvFe_9$)gn^+V cX|3+`JN=A0(=Y5}RGBQ0FR=XyJJTLX06mW!!vFvP diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp index 334edb33..bb975707 100644 --- a/td/telegram/Td.cpp +++ b/td/telegram/Td.cpp @@ -5693,19 +5693,6 @@ void Td::on_request(uint64 id, const td_api::downloadFile &request) { send_closure(actor_id(this), &Td::send_result, id, std::move(file)); } -void Td::on_request(uint64 id, const td_api::setFileDownloadOffset &request) { - if (request.offset_ < 0) { - return send_error_raw(id, 5, "Download offset must be non-negative"); - } - file_manager_->download_set_offset(FileId(request.file_id_, 0), request.offset_); - auto file = file_manager_->get_file_object(FileId(request.file_id_, 0), false); - if (file->id_ == 0) { - return send_error_raw(id, 400, "Invalid file id"); - } - - send_closure(actor_id(this), &Td::send_result, id, std::move(file)); -} - void Td::on_request(uint64 id, const td_api::cancelDownloadFile &request) { file_manager_->download(FileId(request.file_id_, 0), nullptr, request.only_if_pending_ ? -1 : 0, -1); diff --git a/td/telegram/Td.h b/td/telegram/Td.h index 73556a75..bce33244 100644 --- a/td/telegram/Td.h +++ b/td/telegram/Td.h @@ -646,8 +646,6 @@ class Td final : public NetQueryCallback { void on_request(uint64 id, const td_api::downloadFile &request); - void on_request(uint64 id, const td_api::setFileDownloadOffset &request); - void on_request(uint64 id, const td_api::cancelDownloadFile &request); void on_request(uint64 id, td_api::uploadFile &request); diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp index e7e9d27e..15d4d315 100644 --- a/td/telegram/cli.cpp +++ b/td/telegram/cli.cpp @@ -2276,12 +2276,6 @@ class CliClient final : public Actor { send_request(make_tl_object( as_location(latitude, longitude), to_integer(zoom), to_integer(width), to_integer(height), to_integer(scale), as_chat_id(chat_id))); - } else if (op == "sfdo" || op == "SetDownloadFileOffset") { - string file_id; - string offset; - std::tie(file_id, offset) = split(args); - - send_request(make_tl_object(as_file_id(file_id), to_integer(offset))); } else if (op == "df" || op == "DownloadFile") { string file_id; string priority; diff --git a/td/telegram/files/FileManager.cpp b/td/telegram/files/FileManager.cpp index 8d5f3b63..c9dd2949 100644 --- a/td/telegram/files/FileManager.cpp +++ b/td/telegram/files/FileManager.cpp @@ -1619,18 +1619,6 @@ void FileManager::download(FileId file_id, std::shared_ptr cal try_flush_node(node, "download"); } -void FileManager::download_set_offset(FileId file_id, int64 offset) { - auto file_node = get_sync_file_node(file_id); - if (!file_node) { - LOG(INFO) << "File " << file_id << " not found"; - return; - } - file_node->set_download_offset(offset); - run_generate(file_node); - run_download(file_node); - try_flush_node(file_node, "download_set_offset"); -} - void FileManager::run_download(FileNodePtr node) { if (node->need_load_from_pmc_) { return; diff --git a/td/telegram/files/FileManager.h b/td/telegram/files/FileManager.h index 52dd0f56..2fb03cae 100644 --- a/td/telegram/files/FileManager.h +++ b/td/telegram/files/FileManager.h @@ -344,7 +344,6 @@ class FileManager : public FileLoadManager::Callback { bool set_content(FileId file_id, BufferSlice bytes); void download(FileId file_id, std::shared_ptr callback, int32 new_priority, int64 offset); - void download_set_offset(FileId file_id, int64 offset); void upload(FileId file_id, std::shared_ptr callback, int32 new_priority, uint64 upload_order); void resume_upload(FileId file_id, std::vector bad_parts, std::shared_ptr callback, int32 new_priority, uint64 upload_order);