Make DownloadManager interface mostly asynchronous.

td/telegram/DownloadManager.cpp

@@ -83,15 +83,15 @@ class DownloadManagerImpl final : public DownloadManager {
     load_database_files();
   }
 
-  Status toggle_is_paused(FileId file_id, bool is_paused) final {
+  void toggle_is_paused(FileId file_id, bool is_paused, Promise<Unit> promise) final {
-    TRY_STATUS(check_is_active());
+    TRY_STATUS_PROMISE(promise, check_is_active());
-    TRY_RESULT(file_info_ptr, get_file_info(file_id));
+    TRY_RESULT_PROMISE(promise, file_info_ptr, get_file_info(file_id));
     toggle_is_paused(*file_info_ptr, is_paused);
-    return Status::OK();
+    promise.set_value(Unit());
   }
 
-  Status toggle_all_is_paused(bool is_paused) final {
+  void toggle_all_is_paused(bool is_paused, Promise<Unit> promise) final {
-    TRY_STATUS(check_is_active());
+    TRY_STATUS_PROMISE(promise, check_is_active());
 
     vector<FileId> to_toggle;
     for (auto &it : files_) {
@@ -107,10 +107,14 @@ class DownloadManagerImpl final : public DownloadManager {
       }
     }
 
-    return Status::OK();
+    promise.set_value(Unit());
   }
 
-  Status remove_file(FileId file_id, FileSourceId file_source_id, bool delete_from_cache) final {
+  void remove_file(FileId file_id, FileSourceId file_source_id, bool delete_from_cache, Promise<Unit> promise) final {
+    promise.set_result(remove_file_impl(file_id, file_source_id, delete_from_cache));
+  }
+
+  Status remove_file_impl(FileId file_id, FileSourceId file_source_id, bool delete_from_cache) {
     LOG(INFO) << "Remove from downloads file " << file_id << " from " << file_source_id;
     TRY_STATUS(check_is_active());
     TRY_RESULT(file_info_ptr, get_file_info(file_id, file_source_id));
@@ -140,17 +144,21 @@ class DownloadManagerImpl final : public DownloadManager {
     return Status::OK();
   }
 
-  Status remove_file_if_finished(FileId file_id) {
+  void remove_file_if_finished(FileId file_id) final {
+    remove_file_if_finished_impl(file_id).ignore();
+  }
+
+  Status remove_file_if_finished_impl(FileId file_id) {
     TRY_STATUS(check_is_active());
     TRY_RESULT(file_info_ptr, get_file_info(file_id, {}));
     if (!is_completed(*file_info_ptr)) {
       return Status::Error("File is active");
     }
-    return remove_file(file_id, {}, false);
+    return remove_file_impl(file_id, {}, false);
   }
 
-  Status remove_all_files(bool only_active, bool only_completed, bool delete_from_cache) final {
+  void remove_all_files(bool only_active, bool only_completed, bool delete_from_cache, Promise<Unit> promise) final {
-    TRY_STATUS(check_is_active());
+    TRY_STATUS_PROMISE(promise, check_is_active());
     vector<FileId> to_remove;
     for (auto &it : files_) {
       FileInfo &file_info = *it.second;
@@ -163,15 +171,15 @@ class DownloadManagerImpl final : public DownloadManager {
       to_remove.push_back(file_info.file_id);
     }
     for (auto file_id : to_remove) {
-      remove_file(file_id, {}, delete_from_cache);
+      remove_file_impl(file_id, {}, delete_from_cache);
     }
-    return Status::OK();
+    promise.set_value(Unit());
   }
 
   Status add_file(FileId file_id, FileSourceId file_source_id, string search_text, int8 priority) final {
     TRY_STATUS(check_is_active());
 
-    remove_file(file_id, {}, false);
+    remove_file_impl(file_id, {}, false);
 
     auto download_id = next_download_id();
 
@@ -189,16 +197,20 @@ class DownloadManagerImpl final : public DownloadManager {
     return Status::OK();
   }
 
-  Status change_search_text(FileId file_id, FileSourceId file_source_id, string search_text) final {
+  void change_search_text(FileId file_id, FileSourceId file_source_id, string search_text) final {
     if (!is_search_inited_) {
-      return Status::OK();
+      return;
     }
 
-    TRY_STATUS(check_is_active());
+    if (check_is_active().is_error()) {
-    TRY_RESULT(file_info_ptr, get_file_info(file_id, file_source_id));
+      return;
-    auto &file_info = *file_info_ptr;
+    }
+    auto r_file_info_ptr = get_file_info(file_id, file_source_id);
+    if (r_file_info_ptr.is_error()) {
+      return;
+    }
+    auto &file_info = *r_file_info_ptr.ok();
     hints_.add(file_info.download_id, search_text.empty() ? string(" ") : search_text);
-    return Status::OK();
   }
 
   void hints_synchronized(Result<Unit>) {
@@ -338,7 +350,7 @@ class DownloadManagerImpl final : public DownloadManager {
       return;
     }
     auto &file_info = *r_file_info_ptr.ok();
-    remove_file(file_info.file_id, {}, false);
+    remove_file_impl(file_info.file_id, {}, false);
   }
 
   void update_file_viewed(FileId file_id, FileSourceId file_source_id) final {
@@ -540,7 +552,7 @@ class DownloadManagerImpl final : public DownloadManager {
 
     if (r_search_text.is_error()) {
       if (!G()->close_flag()) {
-        remove_file(it->second->file_id, {}, false);
+        remove_file_impl(it->second->file_id, {}, false);
       }
     } else {
       auto search_text = r_search_text.move_as_ok();
@@ -766,7 +778,7 @@ class DownloadManagerImpl final : public DownloadManager {
     while (completed_download_ids_.size() > MAX_COMPLETED_DOWNLOADS) {
       auto download_id = *completed_download_ids_.begin();
       auto file_info = get_file_info(download_id).move_as_ok();
-      remove_file(file_info->file_id, FileSourceId(), false);
+      remove_file_impl(file_info->file_id, FileSourceId(), false);
     }
   }
 

td/telegram/DownloadManager.h

@@ -88,14 +88,16 @@ class DownloadManager : public Actor {
   //
   virtual void after_get_difference() = 0;
   virtual Status add_file(FileId file_id, FileSourceId file_source_id, string search_text, int8 priority) = 0;
-  virtual Status change_search_text(FileId file_id, FileSourceId file_source_id, string search_text) = 0;
+  virtual void change_search_text(FileId file_id, FileSourceId file_source_id, string search_text) = 0;
-  virtual Status toggle_is_paused(FileId file_id, bool is_paused) = 0;
+  virtual void remove_file_if_finished(FileId file_id) = 0;
-  virtual Status toggle_all_is_paused(bool is_paused) = 0;
+  virtual void toggle_is_paused(FileId file_id, bool is_paused, Promise<Unit> promise) = 0;
+  virtual void toggle_all_is_paused(bool is_paused, Promise<Unit> promise) = 0;
   virtual void search(string query, bool only_active, bool only_completed, string offset, int32 limit,
                       Promise<td_api::object_ptr<td_api::foundFileDownloads>> promise) = 0;
-  virtual Status remove_file(FileId file_id, FileSourceId file_source_id, bool delete_from_cache) = 0;
+  virtual void remove_file(FileId file_id, FileSourceId file_source_id, bool delete_from_cache,
-  virtual Status remove_file_if_finished(FileId file_id) = 0;
+                           Promise<Unit> promise) = 0;
-  virtual Status remove_all_files(bool only_active, bool only_completed, bool delete_from_cache) = 0;
+  virtual void remove_all_files(bool only_active, bool only_completed, bool delete_from_cache,
+                                Promise<Unit> promise) = 0;
 
   //
   // private interface to handle all kinds of updates

td/telegram/MessagesManager.cpp

@@ -20698,7 +20698,8 @@ Status MessagesManager::view_messages(DialogId dialog_id, MessageId top_thread_m
         for (auto file_id : get_message_file_ids(m)) {
           auto file_view = td_->file_manager_->get_file_view(file_id);
           CHECK(!file_view.empty());
-          td_->download_manager_->update_file_viewed(file_view.get_main_file_id(), file_source_id);
+          send_closure(td_->download_manager_actor_, &DownloadManager::update_file_viewed, file_view.get_main_file_id(),
+                       file_source_id);
         }
       }
 
@@ -22867,7 +22868,7 @@ void MessagesManager::remove_message_file_sources(DialogId dialog_id, const Mess
     for (auto file_id : file_ids) {
       auto file_view = td_->file_manager_->get_file_view(file_id);
       send_closure(td_->download_manager_actor_, &DownloadManager::remove_file, file_view.get_main_file_id(),
-                   file_source_id, false);
+                   file_source_id, false, Promise<Unit>());
       td_->file_manager_->remove_file_source(file_id, file_source_id);
     }
   }
@@ -22894,7 +22895,7 @@ void MessagesManager::change_message_files(DialogId dialog_id, const Message *m,
       if (file_source_id.is_valid()) {
         auto file_view = td_->file_manager_->get_file_view(file_id);
         send_closure(td_->download_manager_actor_, &DownloadManager::remove_file, file_view.get_main_file_id(),
-                     file_source_id, false);
+                     file_source_id, false, Promise<Unit>());
       }
     }
   }

td/telegram/Td.cpp

@@ -6652,23 +6652,26 @@ void Td::on_request(uint64 id, const td_api::addFileToDownloads &request) {
 
 void Td::on_request(uint64 id, const td_api::toggleDownloadIsPaused &request) {
   CREATE_OK_REQUEST_PROMISE();
-  promise.set_result(download_manager_->toggle_is_paused(FileId(request.file_id_, 0), request.is_paused_));
+  send_closure(download_manager_actor_, &DownloadManager::toggle_is_paused, FileId(request.file_id_, 0),
+               request.is_paused_, std::move(promise));
 }
 
 void Td::on_request(uint64 id, const td_api::toggleAllDownloadsArePaused &request) {
   CREATE_OK_REQUEST_PROMISE();
-  promise.set_result(download_manager_->toggle_all_is_paused(request.are_paused_));
+  send_closure(download_manager_actor_, &DownloadManager::toggle_all_is_paused, request.are_paused_,
+               std::move(promise));
 }
 
 void Td::on_request(uint64 id, const td_api::removeFileFromDownloads &request) {
   CREATE_OK_REQUEST_PROMISE();
-  promise.set_result(download_manager_->remove_file(FileId(request.file_id_, 0), {}, request.delete_from_cache_));
+  send_closure(download_manager_actor_, &DownloadManager::remove_file, FileId(request.file_id_, 0), FileSourceId(),
+               request.delete_from_cache_, std::move(promise));
 }
 
 void Td::on_request(uint64 id, const td_api::removeAllFilesFromDownloads &request) {
   CREATE_OK_REQUEST_PROMISE();
-  promise.set_result(
+  send_closure(download_manager_actor_, &DownloadManager::remove_all_files, request.only_active_,
-      download_manager_->remove_all_files(request.only_active_, request.only_completed_, request.delete_from_cache_));
+               request.only_completed_, request.delete_from_cache_, std::move(promise));
 }
 
 void Td::on_request(uint64 id, td_api::searchFileDownloads &request) {

td/telegram/UpdatesManager.cpp

@@ -1617,7 +1617,7 @@ void UpdatesManager::after_get_difference() {
     }
   }
 
-  td_->download_manager_->after_get_difference();
+  send_closure(td_->download_manager_actor_, &DownloadManager::after_get_difference);
   td_->inline_queries_manager_->after_get_difference();
   td_->messages_manager_->after_get_difference();
   send_closure_later(td_->notification_manager_actor_, &NotificationManager::after_get_difference);