mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-25 06:19:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

Append _errror to saved text file, remove if the request was successful

Browse Source
This commit is contained in:
Malin E
2022-03-24 13:31:49 +01:00
parent 8f08c75bd6
commit 8c4b72ee80
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
View File

@@ -527,15 +527,16 @@ bool HorizonsDialog::handleRequest() {
bool isValid = handleResult(result);
if (!isValid && std::filesystem::is_regular_file(_horizonsFile.file())) {
std::filesystem::path oldName = _horizonsFile.file();
std::filesystem::path newName = _horizonsFile.file().replace_extension(".txt");
std::string newName = _horizonsFile.file().filename().string();
newName = newName.substr(0, newName.size() - newName.find_first_of('.'));
// TODO: What to do if the txt file already exists?
if (std::filesystem::is_regular_file(newName)) {
return isValid;
}
std::filesystem::path oldFile = _horizonsFile.file()
std::filesystem::path newFile =_horizonsFile.file().replace_filename(
newName + "_error"
);
newFile = newFile.replace_extension(".txt");
std::filesystem::rename(oldName, newName);
std::filesystem::rename(oldFile, newFile);
}
return isValid;
@@ -883,9 +884,21 @@ openspace::HorizonsFile HorizonsDialog::handleAnswer(json& answer) {
bool HorizonsDialog::handleResult(openspace::HorizonsFile::ResultCode& result) {
switch (result) {
case openspace::HorizonsFile::ResultCode::Valid:
return true;
case openspace::HorizonsFile::ResultCode::Valid: {
// If the request worked then delete the corresponding error file if it exist
std::string newName = _horizonsFile.file().filename().string();
newName = newName.substr(0, newName.size() - newName.find_first_of('.'));
std::filesystem::path errorFile = _horizonsFile.file().replace_filename(
newName + "_error"
);
errorFile = errorFile.replace_extension(".txt");
if (std::filesystem::is_regular_file(errorFile)) {
std::filesystem::remove(errorFile);
}
return true;
}
case openspace::HorizonsFile::ResultCode::InvalidFormat:
appendLog(fmt::format("Format of file '{}' is invalid. Horizons files must "
"have extension '.hrz'", _horizonsFile.file()),