Improve files_directory checking.
This commit is contained in:
parent
5b4f29e781
commit
03e7c4ce7c
@ -549,10 +549,6 @@ Status TdDb::check_parameters(TdParameters ¶meters) {
|
||||
VLOG(td_init) << "Fix database_directory";
|
||||
parameters.database_directory = ".";
|
||||
}
|
||||
if (parameters.files_directory.empty()) {
|
||||
VLOG(td_init) << "Fix files_directory";
|
||||
parameters.files_directory = parameters.database_directory;
|
||||
}
|
||||
if (parameters.use_message_db && !parameters.use_chat_info_db) {
|
||||
VLOG(td_init) << "Fix use_chat_info_db";
|
||||
parameters.use_chat_info_db = true;
|
||||
@ -586,6 +582,9 @@ Status TdDb::check_parameters(TdParameters ¶meters) {
|
||||
}
|
||||
parameters.database_directory = r_database_directory.move_as_ok();
|
||||
|
||||
if (parameters.files_directory.empty()) {
|
||||
parameters.files_directory = parameters.database_directory;
|
||||
} else {
|
||||
auto r_files_directory = prepare_dir(parameters.files_directory);
|
||||
if (r_files_directory.is_error()) {
|
||||
VLOG(td_init) << "Invalid files_directory";
|
||||
@ -593,6 +592,7 @@ Status TdDb::check_parameters(TdParameters ¶meters) {
|
||||
<< "\": " << r_files_directory.error());
|
||||
}
|
||||
parameters.files_directory = r_files_directory.move_as_ok();
|
||||
}
|
||||
|
||||
return Status::OK();
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user