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

Rename FileNode.name to remote_name.

Browse Source 
GitOrigin-RevId: 578a0ae7728ef97b35dc8d5bcbbe7c2456a3dd6c
This commit is contained in:
levlam 2018-02-18 19:29:44 +03:00
parent a17c3c7ca9
commit 0c9eb44038
6 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
td/telegram/MessagesManager.cpp
View File

@ -8918,7 +8918,7 @@ void MessagesManager::on_send_secret_message_success(int64 random_id, MessageId
new_file_id = td_->file_manager_->register_remote(
FullRemoteFileLocation(FileType::Encrypted, file->id_, file->access_hash_, DcId::internal(file->dc_id_)),
FileLocationSource::FromServer, owner_dialog_id, 0, 0);
FileLocationSource::FromServer, owner_dialog_id, 0, 0, "");
}
}

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

@ -64,12 +64,13 @@ Result<std::pair<FileFd, string>> open_temp_file(const FileType &file_type) {
}
Result<string> create_from_temp(CSlice temp_path, CSlice dir, CSlice name) {
decltype(try_create_new_file("path")) res;
LOG(INFO) << "Create file in directory " << dir << " with suggested name " << name << " from temporary file "
<< temp_path;
auto cleaned_name = clean_filename(name);
PathView path_view(cleaned_name);
auto stem = path_view.file_stem();
auto ext = path_view.extension();
Result<std::pair<FileFd, string>> res;
if (!stem.empty() && !G()->parameters().ignore_file_names) {
res = try_create_new_file(PSLICE_SAFE() << dir << stem << Ext{ext});
for (int i = 0; res.is_error() && i < 10; i++) {

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

@ -1088,7 +1088,7 @@ class FileData {
unique_ptr<FullGenerateFileLocation> generate_;
int64 size_ = 0;
int64 expected_size_ = 0;
string name_;
string remote_name_;
string url_;
FileEncryptionKey encryption_key_;
@ -1115,7 +1115,7 @@ class FileData {
} else {
store(size_, storer);
}
store(name_, storer);
store(remote_name_, storer);
store(url_, storer);
store(encryption_key_, storer);
}
@ -1147,14 +1147,14 @@ class FileData {
} else {
parse(size_, parser);
}
parse(name_, parser);
parse(remote_name_, parser);
parse(url_, parser);
parse(encryption_key_, parser);
}
};
inline StringBuilder &operator<<(StringBuilder &sb, const FileData &file_data) {
sb << "[" << tag("name", file_data.name_) << " " << file_data.owner_dialog_id_ << " " << tag("size", file_data.size_)
<< tag("expected_size", file_data.expected_size_);
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_);
if (!file_data.url_.empty()) {
sb << tag("url", file_data.url_);
}

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

@ -113,9 +113,9 @@ void FileNode::set_expected_size(int64 expected_size) {
}
}
void FileNode::set_name(string name) {
if (name_ != name) {
name_ = std::move(name);
void FileNode::set_remote_name(string remote_name) {
if (remote_name_ != remote_name) {
remote_name_ = std::move(remote_name);
on_pmc_changed();
}
}
@ -331,8 +331,8 @@ const string &FileView::url() const {
return node_->url_;
}
const string &FileView::name() const {
return node_->name_;
const string &FileView::remote_name() const {
return node_->remote_name_;
}
DialogId FileView::owner_dialog_id() const {
@ -622,7 +622,7 @@ FileId FileManager::register_remote(const FullRemoteFileLocation &location, File
data.owner_dialog_id_ = owner_dialog_id;
data.size_ = size;
data.expected_size_ = expected_size;
data.name_ = std::move(name);
data.remote_name_ = std::move(name);
return register_file(std::move(data), file_location_source, "register_remote", false).move_as_ok();
}
@ -683,7 +683,7 @@ Result<FileId> FileManager::register_file(FileData data, FileLocationSource file
auto file_node_id = next_file_node_id();
auto &node = file_nodes_[file_node_id];
node = std::make_unique<FileNode>(std::move(data.local_), std::move(data.remote_), std::move(data.generate_),
data.size_, data.expected_size_, std::move(data.name_), std::move(data.url_),
data.size_, data.expected_size_, std::move(data.remote_name_), std::move(data.url_),
data.owner_dialog_id_, std::move(data.encryption_key_), file_id,
static_cast<int8>(has_remote));
node->remote_source_ = file_location_source;
@ -899,7 +899,7 @@ Result<FileId> FileManager::merge(FileId x_file_id, FileId y_file_id, bool no_sy
int generate_i = merge_choose(x_node->generate_, y_node->generate_);
int size_i = merge_choose_size(x_node->size_, y_node->size_);
int expected_size_i = merge_choose_expected_size(x_node->expected_size_, y_node->expected_size_);
int name_i = merge_choose_name(x_node->name_, y_node->name_);
int remote_name_i = merge_choose_name(x_node->remote_name_, y_node->remote_name_);
int url_i = merge_choose_name(x_node->url_, y_node->url_);
int owner_i = merge_choose_owner(x_node->owner_dialog_id_, y_node->owner_dialog_id_);
int encryption_key_i = merge_choose_encryption_key(x_node->encryption_key_, y_node->encryption_key_);
@ -932,7 +932,7 @@ Result<FileId> FileManager::merge(FileId x_file_id, FileId y_file_id, bool no_sy
LOG(INFO) << "x_node->pmc_id_ = " << x_node->pmc_id_ << ", y_node->pmc_id_ = " << y_node->pmc_id_
<< ", x_node_size = " << x_node->file_ids_.size() << ", y_node_size = " << y_node->file_ids_.size()
<< ", node_i = " << node_i << ", local_i = " << local_i << ", remote_i = " << remote_i
<< ", generate_i = " << generate_i << ", size_i = " << size_i << ", name_i = " << name_i
<< ", generate_i = " << generate_i << ", size_i = " << size_i << ", remote_name_i = " << remote_name_i
<< ", url_i = " << url_i << ", owner_i = " << owner_i << ", encryption_key_i = " << encryption_key_i
<< ", main_file_id_i = " << main_file_id_i;
if (local_i == other_node_i) {
@ -993,8 +993,8 @@ Result<FileId> FileManager::merge(FileId x_file_id, FileId y_file_id, bool no_sy
node->set_expected_size(other_node->expected_size_);
}
if (name_i == other_node_i) {
node->set_name(other_node->name_);
if (remote_name_i == other_node_i) {
node->set_remote_name(other_node->remote_name_);
}
if (url_i == other_node_i) {
@ -1151,7 +1151,7 @@ void FileManager::flush_to_pmc(FileNodePtr node, bool new_remote, bool new_local
data.size_ = node->size_;
data.expected_size_ = node->expected_size_;
data.name_ = node->name_;
data.remote_name_ = node->remote_name_;
data.encryption_key_ = node->encryption_key_;
data.url_ = node->url_;
data.owner_dialog_id_ = node->owner_dialog_id_;
@ -1273,7 +1273,7 @@ bool FileManager::set_content(FileId file_id, BufferSlice bytes) {
node->download_id_ = id;
node->is_download_started_ = true;
send_closure(file_load_manager_, &FileLoadManager::from_bytes, id, node->remote_.full().file_type_, std::move(bytes),
node->name_);
node->remote_name_);
return true;
}
@ -1423,7 +1423,7 @@ void FileManager::run_download(FileNodePtr node) {
node->download_id_ = id;
node->is_download_started_ = false;
send_closure(file_load_manager_, &FileLoadManager::download, id, node->remote_.full(), node->local_, node->size_,
node->name_, node->encryption_key_, priority);
node->remote_name_, node->encryption_key_, priority);
}
void FileManager::resume_upload(FileId file_id, std::vector<int> bad_parts, std::shared_ptr<UploadCallback> callback,
@ -1566,7 +1566,7 @@ void FileManager::run_generate(FileNodePtr node) {
QueryId id = queries_container_.create(Query{file_id, Query::Generate});
node->generate_id_ = id;
send_closure(file_generate_manager_, &FileGenerateManager::generate_file, id, *node->generate_, node->local_,
node->name_, [file_manager = this, id] {
node->remote_name_, [file_manager = this, id] {
class Callback : public FileGenerateCallback {
ActorId<FileManager> actor_;
uint64 query_id_;

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

@ -35,14 +35,14 @@ enum class FileLocationSource : int8 { None, FromUser, FromDb, FromServer };
class FileNode {
public:
FileNode(LocalFileLocation local, RemoteFileLocation remote, unique_ptr<FullGenerateFileLocation> generate,
int64 size, int64 expected_size, string name, string url, DialogId owner_dialog_id, FileEncryptionKey key,
FileId main_file_id, int8 main_file_id_priority)
int64 size, int64 expected_size, string remote_name, string url, DialogId owner_dialog_id,
FileEncryptionKey key, FileId main_file_id, int8 main_file_id_priority)
: local_(std::move(local))
, remote_(std::move(remote))
, generate_(std::move(generate))
, size_(size)
, expected_size_(expected_size)
, name_(std::move(name))
, remote_name_(std::move(remote_name))
, url_(std::move(url))
, owner_dialog_id_(owner_dialog_id)
, encryption_key_(std::move(key))
@ -54,7 +54,7 @@ class FileNode {
void set_generate_location(unique_ptr<FullGenerateFileLocation> &&generate);
void set_size(int64 size);
void set_expected_size(int64 expected_size);
void set_name(string name);
void set_remote_name(string remote_name);
void set_url(string url);
void set_owner_dialog_id(DialogId owner_id);
void set_encryption_key(FileEncryptionKey key);
@ -90,7 +90,7 @@ class FileNode {
int64 size_ = 0;
int64 expected_size_ = 0;
string name_;
string remote_name_;
string url_;
DialogId owner_dialog_id_;
FileEncryptionKey encryption_key_;
@ -179,7 +179,7 @@ class FileView {
bool has_url() const;
const string &url() const;
const string &name() const;
const string &remote_name() const;
DialogId owner_dialog_id() const;
@ -287,8 +287,7 @@ class FileManager : public FileLoadManager::Callback {
Result<FileId> register_local(FullLocalFileLocation location, DialogId owner_dialog_id, int64 size,
bool get_by_hash = false, bool force = false) TD_WARN_UNUSED_RESULT;
FileId register_remote(const FullRemoteFileLocation &location, FileLocationSource file_location_source,
DialogId owner_dialog_id, int64 size, int64 expected_size,
string name = "") TD_WARN_UNUSED_RESULT;
DialogId owner_dialog_id, int64 size, int64 expected_size, string name) TD_WARN_UNUSED_RESULT;
Result<FileId> register_generate(FileType file_type, FileLocationSource file_location_source, string original_path,
string conversion, DialogId owner_dialog_id,
int64 expected_size) TD_WARN_UNUSED_RESULT;

2
td/telegram/files/FileManager.hpp
View File

@ -62,7 +62,7 @@ void FileManager::store_file(FileId file_id, StorerT &storer, int32 ttl) const {
} else {
store(narrow_cast<int32>(file_view.size()), storer);
}
store(file_view.name(), storer);
store(file_view.remote_name(), storer);
store(file_view.owner_dialog_id(), storer);
break;
}