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

Set download offset for encrypted files.

Browse Source 
GitOrigin-RevId: 505d464839bc33e6a969b24dcaddab34863c5f7c
This commit is contained in:
levlam 2018-12-28 01:48:21 +03:00
parent ca1503c22f
commit 9302481d93
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
td/telegram/files/FileLoaderUtils.cpp
View File

@ -76,6 +76,7 @@ bool for_suggested_file_name(CSlice name, bool use_pmc, bool use_random, F &&cal
if (r_path.is_error()) { if (r_path.is_error()) {
return true; return true;
} }
LOG(DEBUG) << "Trying " << r_path.ok();
return callback(r_path.move_as_ok()); return callback(r_path.move_as_ok());
}; };
auto cleaned_name = clean_filename(name); auto cleaned_name = clean_filename(name);

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

@ -1607,10 +1607,6 @@ void FileManager::download(FileId file_id, std::shared_ptr<DownloadCallback> cal
} }
LOG(INFO) << "Change download priority of file " << file_id << " to " << new_priority; LOG(INFO) << "Change download priority of file " << file_id << " to " << new_priority;
if (file_view.is_encrypted_any()) {
// TODO: we need to set offset always and just download from the beginning
offset = 0;
}
node->set_download_offset(offset); node->set_download_offset(offset);
auto *file_info = get_file_id_info(file_id); auto *file_info = get_file_id_info(file_id);
CHECK(new_priority == 0 || callback); CHECK(new_priority == 0 || callback);
@ -1630,9 +1626,6 @@ void FileManager::download_set_offset(FileId file_id, int64 offset) {
LOG(INFO) << "File " << file_id << " not found"; LOG(INFO) << "File " << file_id << " not found";
return; return;
} }
if (FileView(file_node).is_encrypted_any()) {
offset = 0;
}
file_node->set_download_offset(offset); file_node->set_download_offset(offset);
run_generate(file_node); run_generate(file_node);
run_download(file_node); run_download(file_node);
@ -1674,8 +1667,8 @@ void FileManager::run_download(FileNodePtr node) {
CHECK(node->download_id_ != 0); CHECK(node->download_id_ != 0);
send_closure(file_load_manager_, &FileLoadManager::update_priority, node->download_id_, priority); send_closure(file_load_manager_, &FileLoadManager::update_priority, node->download_id_, priority);
if (need_update_offset) { if (need_update_offset) {
send_closure(file_load_manager_, &FileLoadManager::update_download_offset, node->download_id_, auto download_offset = file_view.is_encrypted_any() ? 0 : node->download_offset_;
node->download_offset_); send_closure(file_load_manager_, &FileLoadManager::update_download_offset, node->download_id_, download_offset);
} }
return; return;
} }
@ -1688,9 +1681,9 @@ void FileManager::run_download(FileNodePtr node) {
node->is_download_started_ = false; node->is_download_started_ = false;
LOG(DEBUG) << "Run download of file " << file_id << " of size " << node->size_ << " from " << node->remote_.full() LOG(DEBUG) << "Run download of file " << file_id << " of size " << node->size_ << " from " << node->remote_.full()
<< " with suggested name " << node->suggested_name() << " and encyption key " << node->encryption_key_; << " with suggested name " << node->suggested_name() << " and encyption key " << node->encryption_key_;
auto download_offset = file_view.is_encrypted_any() ? 0 : node->download_offset_;
send_closure(file_load_manager_, &FileLoadManager::download, id, node->remote_.full(), node->local_, node->size_, send_closure(file_load_manager_, &FileLoadManager::download, id, node->remote_.full(), node->local_, node->size_,
node->suggested_name(), node->encryption_key_, node->can_search_locally_, node->download_offset_, node->suggested_name(), node->encryption_key_, node->can_search_locally_, download_offset, priority);
priority);
} }
void FileManager::resume_upload(FileId file_id, std::vector<int> bad_parts, std::shared_ptr<UploadCallback> callback, void FileManager::resume_upload(FileId file_id, std::vector<int> bad_parts, std::shared_ptr<UploadCallback> callback,