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

Rename suggested_name to suggested_path.

Browse Source
This commit is contained in:
levlam 2021-01-26 02:39:48 +03:00
parent 0b868c0aad
commit 15fe7f7a04
7 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
td/telegram/MessageContent.cpp
View File

@ -1583,8 +1583,8 @@ static Result<InputMessageContent> create_input_message_content(
string mime_type;
if (file_id.is_valid()) {
file_view = td->file_manager_->get_file_view(file_id);
auto suggested_name = file_view.suggested_name();
const PathView path_view(suggested_name);
auto suggested_path = file_view.suggested_path();
const PathView path_view(suggested_path);
file_name = path_view.file_name().str();
mime_type = MimeType::from_extension(path_view.extension());
}
@ -2508,11 +2508,13 @@ tl_object_ptr<telegram_api::InputMedia> get_fake_input_media(Td *td, tl_object_p
case FileType::Video:
case FileType::VoiceNote: {
vector<tl_object_ptr<telegram_api::DocumentAttribute>> attributes;
auto file_name = file_view.suggested_name();
auto file_path = file_view.suggested_path();
const PathView path_view(file_path);
Slice file_name = path_view.file_name();
if (!file_name.empty()) {
attributes.push_back(make_tl_object<telegram_api::documentAttributeFilename>(file_name));
attributes.push_back(make_tl_object<telegram_api::documentAttributeFilename>(file_name.str()));
}
string mime_type = MimeType::from_extension(PathView(file_name).extension());
string mime_type = MimeType::from_extension(path_view.extension());
int32 flags = 0;
if (file_type == FileType::Video) {
flags |= telegram_api::inputMediaUploadedDocument::NOSOUND_VIDEO_MASK;
@ -4183,7 +4185,7 @@ unique_ptr<MessageContent> dup_message_content(Td *td, DialogId dialog_id, const
if (to_secret && !file_view.is_encrypted_secret()) {
auto download_file_id = file_manager->dup_file_id(file_id);
file_id = file_manager
->register_generate(FileType::Encrypted, FileLocationSource::FromServer, file_view.suggested_name(),
->register_generate(FileType::Encrypted, FileLocationSource::FromServer, file_view.suggested_path(),
PSTRING() << "#file_id#" << download_file_id.get(), dialog_id, file_view.size())
.ok();
}

2
td/telegram/MessagesManager.cpp
View File

@ -8910,7 +8910,7 @@ void MessagesManager::on_upload_imported_message_attachment(FileId file_id,
CHECK(input_file != nullptr);
td_->create_handler<UploadImportedMediaQuery>(std::move(promise))
->send(dialog_id, import_id, file_view.suggested_name(), file_id,
->send(dialog_id, import_id, file_view.suggested_path(), file_id,
get_fake_input_media(td_, std::move(input_file), file_id));
}

2
td/telegram/SecureManager.cpp
View File

@ -546,7 +546,7 @@ void SetSecureValue::start_upload(FileManager *file_manager, FileId &file_id, Se
auto download_file_id = file_manager->dup_file_id(file_id);
file_id =
file_manager
->register_generate(FileType::Secure, FileLocationSource::FromServer, file_view.suggested_name(),
->register_generate(FileType::Secure, FileLocationSource::FromServer, file_view.suggested_path(),
PSTRING() << "#file_id#" << download_file_id.get(), DialogId(), file_view.size())
.ok();
}

2
td/telegram/SecureValue.cpp
View File

@ -434,7 +434,7 @@ static td_api::object_ptr<td_api::datedFile> get_dated_file_object(FileManager *
file_view.remote_location().get_access_hash(),
file_view.remote_location().get_dc_id(), ""),
FileLocationSource::FromServer, DialogId(), file_view.size(),
file_view.expected_size(), file_view.suggested_name());
file_view.expected_size(), file_view.suggested_path());
return get_dated_file_object(file_manager, dated_file);
}

4
td/telegram/StickersManager.cpp
View File

@ -2385,8 +2385,8 @@ tl_object_ptr<telegram_api::InputMedia> StickersManager::get_input_media(
}
auto mime_type = get_sticker_mime_type(s);
if (!s->is_animated && !s->set_id.is_valid()) {
auto suggested_name = file_view.suggested_name();
const PathView path_view(suggested_name);
auto suggested_path = file_view.suggested_path();
const PathView path_view(suggested_path);
if (path_view.extension() == "tgs") {
mime_type = "application/x-tgsticker";
}

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

@ -462,7 +462,7 @@ void FileNode::on_info_flushed() {
info_changed_flag_ = false;
}
string FileNode::suggested_name() const {
string FileNode::suggested_path() const {
if (!remote_name_.empty()) {
return remote_name_;
}
@ -681,8 +681,8 @@ const string &FileView::remote_name() const {
return node_->remote_name_;
}
string FileView::suggested_name() const {
return node_->suggested_name();
string FileView::suggested_path() const {
return node_->suggested_path();
}
DialogId FileView::owner_dialog_id() const {
@ -1985,7 +1985,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.value().file_type_,
std::move(bytes), node->suggested_name());
std::move(bytes), node->suggested_path());
return true;
}
@ -2302,7 +2302,7 @@ void FileManager::run_download(FileNodePtr node, bool force_update_priority) {
node->download_id_ = id;
node->is_download_started_ = false;
LOG(INFO) << "Run download of file " << file_id << " of size " << node->size_ << " from "
<< node->remote_.full.value() << " with suggested name " << node->suggested_name() << " and encyption key "
<< node->remote_.full.value() << " with suggested name " << node->suggested_path() << " and encyption key "
<< node->encryption_key_;
auto download_offset = node->download_offset_;
auto download_limit = node->download_limit_;
@ -2313,7 +2313,7 @@ void FileManager::run_download(FileNodePtr node, bool force_update_priority) {
download_offset = 0;
}
send_closure(file_load_manager_, &FileLoadManager::download, id, node->remote_.full.value(), node->local_,
node->size_, node->suggested_name(), node->encryption_key_, node->can_search_locally_, download_offset,
node->size_, node->suggested_path(), node->encryption_key_, node->can_search_locally_, download_offset,
download_limit, priority);
}
@ -2667,7 +2667,7 @@ void FileManager::run_generate(FileNodePtr node) {
QueryId id = queries_container_.create(Query{file_id, Query::Type::Generate});
node->generate_id_ = id;
send_closure(file_generate_manager_, &FileGenerateManager::generate_file, id, *node->generate_, node->local_,
node->suggested_name(), [file_manager = this, id] {
node->suggested_path(), [file_manager = this, id] {
class Callback : public FileGenerateCallback {
ActorId<FileManager> actor_;
uint64 query_id_;
@ -3490,7 +3490,7 @@ void FileManager::on_upload_ok(QueryId query_id, FileType file_type, const Parti
file_info->download_priority_ = 0;
FileView file_view(file_node);
string file_name = get_file_name(file_type, file_view.suggested_name());
string file_name = get_file_name(file_type, file_view.suggested_path());
if (file_view.is_encrypted_secret()) {
tl_object_ptr<telegram_api::InputEncryptedFile> input_file;

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

@ -118,7 +118,7 @@ class FileNode {
void on_pmc_flushed();
void on_info_flushed();
string suggested_name() const;
string suggested_path() const;
private:
friend class FileView;
@ -258,7 +258,7 @@ class FileView {
const string &remote_name() const;
string suggested_name() const;
string suggested_path() const;
DialogId owner_dialog_id() const;