updated build system
This commit is contained in:
parent
fcd38db2ef
commit
d518e55a67
@ -706,7 +706,6 @@ void app_config::save() {
|
|||||||
}
|
}
|
||||||
config_changed_ = false;
|
config_changed_ = false;
|
||||||
json data = get_json();
|
json data = get_json();
|
||||||
std::cout << "saving: " << data.dump() << std::endl;
|
|
||||||
auto success = false;
|
auto success = false;
|
||||||
for (auto i = 0U; not success && (i < retry_save_count); i++) {
|
for (auto i = 0U; not success && (i < retry_save_count); i++) {
|
||||||
success = utils::file::write_json_file(file_path, data);
|
success = utils::file::write_json_file(file_path, data);
|
||||||
|
@ -44,11 +44,9 @@ TEST(encrypting_reader, get_encrypted_file_name) {
|
|||||||
"test.dat", source_file_name, stop_requested, token, std::nullopt);
|
"test.dat", source_file_name, stop_requested, token, std::nullopt);
|
||||||
|
|
||||||
auto file_name = reader.get_encrypted_file_name();
|
auto file_name = reader.get_encrypted_file_name();
|
||||||
std::cout << file_name << std::endl;
|
|
||||||
|
|
||||||
EXPECT_EQ(api_error::success,
|
EXPECT_EQ(api_error::success,
|
||||||
utils::encryption::decrypt_file_name(token, file_name));
|
utils::encryption::decrypt_file_name(token, file_name));
|
||||||
std::cout << file_name << std::endl;
|
|
||||||
EXPECT_STREQ("test.dat", file_name.c_str());
|
EXPECT_STREQ("test.dat", file_name.c_str());
|
||||||
|
|
||||||
source_file->close();
|
source_file->close();
|
||||||
|
6
support/3rd_party/src/utils/file.cpp
vendored
6
support/3rd_party/src/utils/file.cpp
vendored
@ -76,13 +76,13 @@ auto file::move_to(std::filesystem::path new_path) -> bool {
|
|||||||
if (not error_) {
|
if (not error_) {
|
||||||
path_ = new_path;
|
path_ = new_path;
|
||||||
if (reopen) {
|
if (reopen) {
|
||||||
*this = std::move(open_file(path_));
|
*this = open_file(path_);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (reopen) {
|
if (reopen) {
|
||||||
*this = std::move(open_file(path_));
|
*this = open_file(path_));
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -139,7 +139,7 @@ auto file::truncate(std::size_t size) -> bool {
|
|||||||
|
|
||||||
std::filesystem::resize_file(path_, size, error_);
|
std::filesystem::resize_file(path_, size, error_);
|
||||||
if (reopen) {
|
if (reopen) {
|
||||||
*this = std::move(open_file(path_));
|
*this = open_file(path_);
|
||||||
}
|
}
|
||||||
|
|
||||||
return not error_;
|
return not error_;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user