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

Don't store TdParameters in Td.

Browse Source
This commit is contained in:
levlam 2023-03-13 16:30:11 +03:00
parent 7bd211fd82
commit 2baff56b7a
4 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
td/telegram/Td.cpp
View File

@ -2955,9 +2955,9 @@ void Td::run_request(uint64 id, tl_object_ptr<td_api::Function> function) {
case td_api::setTdlibParameters::ID: { case td_api::setTdlibParameters::ID: {
auto parameters = move_tl_object_as<td_api::setTdlibParameters>(function); auto parameters = move_tl_object_as<td_api::setTdlibParameters>(function);
auto database_encryption_key = as_db_key(std::move(parameters->database_encryption_key_)); auto database_encryption_key = as_db_key(std::move(parameters->database_encryption_key_));
auto status = set_parameters(std::move(parameters)); auto r_parameters = set_parameters(std::move(parameters));
if (status.is_error()) { if (r_parameters.is_error()) {
return send_closure(actor_id(this), &Td::send_error, id, std::move(status)); return send_closure(actor_id(this), &Td::send_error, id, r_parameters.move_as_error());
} }
VLOG(td_init) << "Begin to open database"; VLOG(td_init) << "Begin to open database";
@ -2967,7 +2967,7 @@ void Td::run_request(uint64 id, tl_object_ptr<td_api::Function> function) {
PromiseCreator::lambda([actor_id = actor_id(this)](Result<TdDb::OpenedDatabase> r_opened_database) { PromiseCreator::lambda([actor_id = actor_id(this)](Result<TdDb::OpenedDatabase> r_opened_database) {
send_closure(actor_id, &Td::init, std::move(r_opened_database)); send_closure(actor_id, &Td::init, std::move(r_opened_database));
}); });
return TdDb::open(get_database_scheduler_id(), parameters_, std::move(database_encryption_key), return TdDb::open(get_database_scheduler_id(), r_parameters.move_as_ok(), std::move(database_encryption_key),
std::move(promise)); std::move(promise));
} }
default: default:
@ -3549,14 +3549,14 @@ void Td::init(Result<TdDb::OpenedDatabase> r_opened_database) {
} }
auto events = r_opened_database.move_as_ok(); auto events = r_opened_database.move_as_ok();
parameters_.database_directory = std::move(events.database_directory); LOG(INFO) << "Successfully inited database in " << tag("database_directory", events.parameters.database_directory)
parameters_.files_directory = std::move(events.files_directory); << " and " << tag("files_directory", events.parameters.files_directory);
LOG(INFO) << "Successfully inited database in " << tag("database_directory", parameters_.database_directory)
<< " and " << tag("files_directory", parameters_.files_directory);
VLOG(td_init) << "Successfully inited database"; VLOG(td_init) << "Successfully inited database";
G()->init(parameters_, actor_id(this), std::move(events.database)).ensure(); auto api_id = events.parameters.api_id;
auto api_hash = events.parameters.api_hash;
G()->init(std::move(events.parameters), actor_id(this), std::move(events.database)).ensure();
init_options_and_network(); init_options_and_network();
@ -3600,7 +3600,7 @@ void Td::init(Result<TdDb::OpenedDatabase> r_opened_database) {
}); });
VLOG(td_init) << "Create AuthManager"; VLOG(td_init) << "Create AuthManager";
auth_manager_ = td::make_unique<AuthManager>(parameters_.api_id, parameters_.api_hash, create_reference()); auth_manager_ = td::make_unique<AuthManager>(api_id, api_hash, create_reference());
auth_manager_actor_ = register_actor("AuthManager", auth_manager_.get()); auth_manager_actor_ = register_actor("AuthManager", auth_manager_.get());
G()->set_auth_manager(auth_manager_actor_.get()); G()->set_auth_manager(auth_manager_actor_.get());
@ -4095,7 +4095,7 @@ Status Td::fix_parameters(TdParameters &parameters) {
return Status::OK(); return Status::OK();
} }
Status Td::set_parameters(td_api::object_ptr<td_api::setTdlibParameters> parameters) { Result<TdParameters> Td::set_parameters(td_api::object_ptr<td_api::setTdlibParameters> parameters) {
VLOG(td_init) << "Begin to set TDLib parameters"; VLOG(td_init) << "Begin to set TDLib parameters";
if (!clean_input_string(parameters->api_hash_) || !clean_input_string(parameters->system_language_code_) || if (!clean_input_string(parameters->api_hash_) || !clean_input_string(parameters->system_language_code_) ||
!clean_input_string(parameters->device_model_) || !clean_input_string(parameters->system_version_) || !clean_input_string(parameters->device_model_) || !clean_input_string(parameters->system_version_) ||
@ -4104,19 +4104,20 @@ Status Td::set_parameters(td_api::object_ptr<td_api::setTdlibParameters> paramet
return Status::Error(400, "Strings must be encoded in UTF-8"); return Status::Error(400, "Strings must be encoded in UTF-8");
} }
parameters_.database_directory = parameters->database_directory_; TdParameters result;
parameters_.files_directory = parameters->files_directory_; result.database_directory = parameters->database_directory_;
parameters_.api_id = parameters->api_id_; result.files_directory = parameters->files_directory_;
parameters_.api_hash = parameters->api_hash_; result.api_id = parameters->api_id_;
parameters_.use_test_dc = parameters->use_test_dc_; result.api_hash = parameters->api_hash_;
parameters_.use_file_db = parameters->use_file_database_; result.use_test_dc = parameters->use_test_dc_;
parameters_.use_chat_info_db = parameters->use_chat_info_database_; result.use_file_db = parameters->use_file_database_;
parameters_.use_message_db = parameters->use_message_database_; result.use_chat_info_db = parameters->use_chat_info_database_;
parameters_.use_secret_chats = parameters->use_secret_chats_; result.use_message_db = parameters->use_message_database_;
parameters_.enable_storage_optimizer = parameters->enable_storage_optimizer_; result.use_secret_chats = parameters->use_secret_chats_;
parameters_.ignore_file_names = parameters->ignore_file_names_; result.enable_storage_optimizer = parameters->enable_storage_optimizer_;
result.ignore_file_names = parameters->ignore_file_names_;
TRY_STATUS(fix_parameters(parameters_)); TRY_STATUS(fix_parameters(result));
VLOG(td_init) << "Create MtprotoHeader::Options"; VLOG(td_init) << "Create MtprotoHeader::Options";
options_.api_id = parameters->api_id_; options_.api_id = parameters->api_id_;
@ -4149,7 +4150,7 @@ Status Td::set_parameters(td_api::object_ptr<td_api::setTdlibParameters> paramet
options_.is_emulator = false; options_.is_emulator = false;
options_.proxy = Proxy(); options_.proxy = Proxy();
return Status::OK(); return std::move(result);
} }
void Td::on_request(uint64 id, const td_api::setTdlibParameters &request) { void Td::on_request(uint64 id, const td_api::setTdlibParameters &request) {

4
td/telegram/Td.h
View File

@ -290,8 +290,6 @@ class Td final : public Actor {
MtprotoHeader::Options options_; MtprotoHeader::Options options_;
TdParameters parameters_;
ConnectionState connection_state_ = ConnectionState::Empty; ConnectionState connection_state_ = ConnectionState::Empty;
std::unordered_multimap<uint64, int32> request_set_; std::unordered_multimap<uint64, int32> request_set_;
@ -1610,7 +1608,7 @@ class Td final : public Actor {
static Status fix_parameters(TdParameters &parameters) TD_WARN_UNUSED_RESULT; static Status fix_parameters(TdParameters &parameters) TD_WARN_UNUSED_RESULT;
Status set_parameters(td_api::object_ptr<td_api::setTdlibParameters> parameters) TD_WARN_UNUSED_RESULT; Result<TdParameters> set_parameters(td_api::object_ptr<td_api::setTdlibParameters> parameters) TD_WARN_UNUSED_RESULT;
static td_api::object_ptr<td_api::error> make_error(int32 code, CSlice error) { static td_api::object_ptr<td_api::error> make_error(int32 code, CSlice error) {
return td_api::make_object<td_api::error>(code, error.str()); return td_api::make_object<td_api::error>(code, error.str());

3
td/telegram/TdDb.cpp
View File

@ -444,8 +444,6 @@ void TdDb::open_impl(TdParameters parameters, DbKey key, Promise<OpenedDatabase>
TRY_STATUS_PROMISE(promise, check_parameters(parameters)); TRY_STATUS_PROMISE(promise, check_parameters(parameters));
OpenedDatabase result; OpenedDatabase result;
result.database_directory = parameters.database_directory;
result.files_directory = parameters.files_directory;
// Init pmc // Init pmc
Binlog *binlog_ptr = nullptr; Binlog *binlog_ptr = nullptr;
@ -538,6 +536,7 @@ void TdDb::open_impl(TdParameters parameters, DbKey key, Promise<OpenedDatabase>
db->config_pmc_ = std::move(concurrent_config_pmc); db->config_pmc_ = std::move(concurrent_config_pmc);
db->binlog_ = std::move(concurrent_binlog); db->binlog_ = std::move(concurrent_binlog);
result.parameters = std::move(parameters);
result.database = std::move(db); result.database = std::move(db);
promise.set_value(std::move(result)); promise.set_value(std::move(result));

3
td/telegram/TdDb.h
View File

@ -51,8 +51,7 @@ class TdDb {
~TdDb(); ~TdDb();
struct OpenedDatabase { struct OpenedDatabase {
string database_directory; TdParameters parameters;
string files_directory;
unique_ptr<TdDb> database; unique_ptr<TdDb> database;