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

Store and use expected file size in DownloadManager.

Browse Source
This commit is contained in:
levlam 2022-03-02 15:23:15 +03:00
parent da8391f465
commit 0ea961ebea
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
td/telegram/DownloadManager.cpp
View File

@ -246,9 +246,10 @@ class DownloadManagerImpl final : public DownloadManager {
td_api::make_object<td_api::foundFileDownloads>(total_count, std::move(file_downloads), next_offset)); td_api::make_object<td_api::foundFileDownloads>(total_count, std::move(file_downloads), next_offset));
} }
void update_file_download_state(FileId internal_file_id, int64 download_size, int64 size, bool is_paused) final { void update_file_download_state(FileId internal_file_id, int64 download_size, int64 size, int64 expected_size,
LOG(INFO) << "Update file download state for file " << internal_file_id << " of size " << size bool is_paused) final {
<< " to download_size = " << download_size << " and is_paused = " << is_paused; LOG(INFO) << "Update file download state for file " << internal_file_id << " of size " << size << '/'
<< expected_size << " to download_size = " << download_size << " and is_paused = " << is_paused;
if (!callback_) { if (!callback_) {
return; return;
} }
@ -264,6 +265,7 @@ class DownloadManagerImpl final : public DownloadManager {
with_file_info(file_info, [&](FileInfo &file_info) { with_file_info(file_info, [&](FileInfo &file_info) {
file_info.size = size; file_info.size = size;
file_info.expected_size = expected_size;
file_info.downloaded_size = download_size; file_info.downloaded_size = download_size;
if (is_paused && file_info.is_paused != is_paused) { if (is_paused && file_info.is_paused != is_paused) {
file_info.is_paused = is_paused; file_info.is_paused = is_paused;
@ -297,6 +299,7 @@ class DownloadManagerImpl final : public DownloadManager {
bool is_counted{}; bool is_counted{};
mutable bool need_save_to_db{}; mutable bool need_save_to_db{};
int64 size{}; int64 size{};
int64 expected_size{};
int64 downloaded_size{}; int64 downloaded_size{};
int32 created_at{}; int32 created_at{};
int32 completed_at{}; int32 completed_at{};
@ -324,6 +327,10 @@ class DownloadManagerImpl final : public DownloadManager {
return file_info.completed_at != 0; return file_info.completed_at != 0;
} }
static bool get_file_size(const FileInfo &file_info) {
return file_info.size == 0 ? max(file_info.downloaded_size + 1, file_info.expected_size) : file_info.size;
}
static string pmc_key(const FileInfo &file_info) { static string pmc_key(const FileInfo &file_info) {
return PSTRING() << "dlds#" << file_info.download_id; return PSTRING() << "dlds#" << file_info.download_id;
} }
@ -434,7 +441,8 @@ class DownloadManagerImpl final : public DownloadManager {
file_info->internal_file_id = callback_->dup_file_id(file_info->file_id); file_info->internal_file_id = callback_->dup_file_id(file_info->file_id);
auto file_view = callback_->get_file_view(file_info->file_id); auto file_view = callback_->get_file_view(file_info->file_id);
CHECK(!file_view.empty()); CHECK(!file_view.empty());
file_info->size = file_view.expected_size(); file_info->size = file_view.size();
file_info->expected_size = file_view.expected_size();
file_info->downloaded_size = file_view.local_total_size(); file_info->downloaded_size = file_view.local_total_size();
file_info->is_counted = !is_completed(*file_info); file_info->is_counted = !is_completed(*file_info);
@ -523,7 +531,7 @@ class DownloadManagerImpl final : public DownloadManager {
void unregister_file_info(const FileInfo &file_info) { void unregister_file_info(const FileInfo &file_info) {
if (file_info.is_counted && !file_info.is_paused) { if (file_info.is_counted && !file_info.is_paused) {
counters_.downloaded_size -= file_info.downloaded_size; counters_.downloaded_size -= file_info.downloaded_size;
counters_.total_size -= max(file_info.downloaded_size, file_info.size); counters_.total_size -= get_file_size(file_info);
counters_.total_count--; counters_.total_count--;
} }
} }
@ -531,10 +539,11 @@ class DownloadManagerImpl final : public DownloadManager {
void register_file_info(FileInfo &file_info) { void register_file_info(FileInfo &file_info) {
if (file_info.is_counted && !file_info.is_paused) { if (file_info.is_counted && !file_info.is_paused) {
counters_.downloaded_size += file_info.downloaded_size; counters_.downloaded_size += file_info.downloaded_size;
counters_.total_size += max(file_info.downloaded_size, file_info.size); counters_.total_size += get_file_size(file_info);
counters_.total_count++; counters_.total_count++;
} }
if (!is_completed(file_info) && file_info.size != 0 && file_info.downloaded_size == file_info.size) { if (!is_completed(file_info) && file_info.size != 0 && file_info.downloaded_size == file_info.size) {
file_info.is_paused = false;
file_info.completed_at = G()->unix_time(); file_info.completed_at = G()->unix_time();
file_info.need_save_to_db = true; file_info.need_save_to_db = true;
} }

3
td/telegram/DownloadManager.h
View File

@ -75,7 +75,8 @@ class DownloadManager : public Actor {
// //
// private interface to handle all kinds of updates // private interface to handle all kinds of updates
// //
virtual void update_file_download_state(FileId internal_file_id, int64 download_size, int64 size, bool is_paused) = 0; virtual void update_file_download_state(FileId internal_file_id, int64 download_size, int64 size, int64 expected_size,
bool is_paused) = 0;
virtual void update_file_deleted(FileId internal_file_id) = 0; virtual void update_file_deleted(FileId internal_file_id) = 0;
}; };

2
td/telegram/DownloadManagerCallback.cpp
View File

@ -83,7 +83,7 @@ std::shared_ptr<FileManager::DownloadCallback> DownloadManagerCallback::make_dow
auto td = G()->td().get_actor_unsafe(); auto td = G()->td().get_actor_unsafe();
auto file_view = td->file_manager_->get_file_view(file_id); auto file_view = td->file_manager_->get_file_view(file_id);
send_closure(download_manager_, &DownloadManager::update_file_download_state, file_id, send_closure(download_manager_, &DownloadManager::update_file_download_state, file_id,
file_view.local_total_size(), file_view.size(), is_paused); file_view.local_total_size(), file_view.size(), file_view.expected_size(), is_paused);
// TODO: handle deleted state? // TODO: handle deleted state?
} }
}; };