andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Better file download debug.

Browse Source 
GitOrigin-RevId: f2e33254bca1c1012f2d8f333554b039b47be3ce
This commit is contained in:
levlam 2018-05-30 20:50:11 +03:00
parent 6188a6c118
commit faf9be4231
4 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
td/telegram/files/FileDownloader.cpp
View File

@ -300,7 +300,7 @@ Result<size_t> FileDownloader::process_part(Part part, NetQueryPtr net_query) {
if (encryption_key_.is_secret()) {
padded_size = (part.size + 15) & ~15;
}
LOG(INFO) << "Got " << bytes.size() << " padded_size=" << padded_size;
LOG(INFO) << "Got " << bytes.size() << " bytes, padded_size = " << padded_size << " for " << path_;
if (bytes.size() > padded_size) {
return Status::Error("Part size is more than requested");
}

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

@ -14,6 +14,7 @@
#include "td/utils/logging.h"
namespace td {
FileLoadManager::FileLoadManager(ActorShared<Callback> callback, ActorShared<> parent)
: callback_(std::move(callback)), parent_(std::move(parent)) {
}

24
td/telegram/files/FileLocation.h
View File

@ -242,6 +242,9 @@ struct FileEncryptionKey {
bool empty() const {
return key_iv_.empty();
}
size_t size() const {
return key_iv_.size();
}
template <class StorerT>
void store(StorerT &storer) const {
@ -253,12 +256,17 @@ struct FileEncryptionKey {
if (key_iv_.empty()) {
type_ = Type::None;
} else {
if (type_ == Type::Secure) {
if (key_iv_.size() != 64) {
LOG(ERROR) << "Have wrong key size " << key_iv_.size();
}
}
type_ = type;
}
}
string key_iv_; // TODO wrong alignment is possible
Type type_;
Type type_ = Type::None;
};
inline bool operator==(const FileEncryptionKey &lhs, const FileEncryptionKey &rhs) {
@ -269,6 +277,16 @@ inline bool operator!=(const FileEncryptionKey &lhs, const FileEncryptionKey &rh
return !(lhs == rhs);
}
inline StringBuilder &operator<<(StringBuilder &string_builder, const FileEncryptionKey &key) {
if (key.is_secret()) {
return string_builder << "SecretKey{" << key.size() << "}";
}
if (key.is_secret()) {
return string_builder << "SecureKey{" << key.size() << "}";
}
return string_builder << "NoKey{}";
}
struct EmptyRemoteFileLocation {
template <class StorerT>
void store(StorerT &storer) const {
@ -1247,9 +1265,11 @@ class FileData {
parser);
}
};
inline StringBuilder &operator<<(StringBuilder &sb, const FileData &file_data) {
sb << "[" << tag("remote_name", file_data.remote_name_) << " " << file_data.owner_dialog_id_ << " "
<< tag("size", file_data.size_) << tag("expected_size", file_data.expected_size_);
<< tag("size", file_data.size_) << tag("expected_size", file_data.expected_size_) << " "
<< file_data.encryption_key_;
if (!file_data.url_.empty()) {
sb << tag("url", file_data.url_);
}

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

@ -1505,6 +1505,8 @@ void FileManager::run_download(FileNodePtr node) {
QueryId id = queries_container_.create(Query{file_id, Query::Download});
node->download_id_ = id;
node->is_download_started_ = false;
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_;
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_, priority);
}
@ -2077,6 +2079,7 @@ void FileManager::on_start_download(QueryId query_id) {
auto file_id = query->file_id_;
auto file_node = get_file_node(file_id);
LOG(DEBUG) << "Reseive on_start_download for file " << file_id;
if (!file_node) {
return;
}
@ -2099,6 +2102,7 @@ void FileManager::on_partial_download(QueryId query_id, const PartialLocalFileLo
auto file_id = query->file_id_;
auto file_node = get_file_node(file_id);
LOG(DEBUG) << "Reseive on_parial_download for file " << file_id;
if (!file_node) {
return;
}
@ -2121,6 +2125,7 @@ void FileManager::on_hash(QueryId query_id, string hash) {
auto file_id = query->file_id_;
auto file_node = get_file_node(file_id);
LOG(DEBUG) << "Reseive on_hash for file " << file_id;
if (!file_node) {
return;
}
@ -2142,6 +2147,7 @@ void FileManager::on_partial_upload(QueryId query_id, const PartialRemoteFileLoc
auto file_id = query->file_id_;
auto file_node = get_file_node(file_id);
LOG(DEBUG) << "Reseive on_partial_upload for file " << file_id;
if (!file_node) {
return;
}
@ -2250,8 +2256,8 @@ void FileManager::on_upload_full_ok(QueryId query_id, const FullRemoteFileLocati
return;
}
LOG(INFO) << "ON UPLOAD OK";
auto file_id = finish_query(query_id).first.file_id_;
LOG(INFO) << "ON UPLOAD FULL OK for file " << file_id;
auto new_file_id = register_remote(remote, FileLocationSource::FromServer, DialogId(), 0, 0, "");
LOG_STATUS(merge(new_file_id, file_id));
}
@ -2262,12 +2268,13 @@ void FileManager::on_partial_generate(QueryId query_id, const PartialLocalFileLo
return;
}
LOG(INFO) << "on_parital_generate: " << partial_local.path_ << " " << partial_local.ready_part_count_;
auto query = queries_container_.get(query_id);
CHECK(query != nullptr);
auto file_id = query->file_id_;
auto file_node = get_file_node(file_id);
LOG(DEBUG) << "Receive on_parital_generate for file " << file_id << ": " << partial_local.path_ << " "
<< partial_local.ready_part_count_;
if (!file_node) {
return;
}
@ -2296,12 +2303,12 @@ void FileManager::on_generate_ok(QueryId query_id, const FullLocalFileLocation &
return;
}
LOG(INFO) << "on_ok_generate: " << local;
Query query;
bool was_active;
std::tie(query, was_active) = finish_query(query_id);
auto generate_file_id = query.file_id_;
LOG(INFO) << "Receive on_generate_ok for file " << generate_file_id << ": " << local;
auto file_node = get_file_node(generate_file_id);
if (!file_node) {
return;