doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Catch YAML exceptions when parsing bloom.yaml

Browse Source
This commit is contained in:
Nav
2022-09-24 18:35:31 +01:00
parent 6e0038b41c
commit af2fcde031
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Application.cpp
View File

@@ -4,6 +4,8 @@
#include <QFile> #include <QFile>
#include <QJsonDocument> #include <QJsonDocument>
#include <unistd.h> #include <unistd.h>
#include <yaml-cpp/yaml.h>
#include <yaml-cpp/exceptions.h>
#include "src/Logger/Logger.hpp" #include "src/Logger/Logger.hpp"
#include "src/Helpers/Paths.hpp" #include "src/Helpers/Paths.hpp"
@@ -75,7 +77,7 @@ namespace Bloom
} }
} catch (const InvalidConfig& exception) { } catch (const InvalidConfig& exception) {
Logger::error(exception.getMessage()); Logger::error("Invalid project configuration (bloom.yaml) - " + exception.getMessage());
} catch (const Exception& exception) { } catch (const Exception& exception) {
Logger::error(exception.getMessage()); Logger::error(exception.getMessage());
@@ -263,10 +265,15 @@ namespace Bloom
); );
} }
const auto configNode = YAML::Load(configFile.readAll().toStdString()); try {
configFile.close(); const auto configNode = YAML::Load(configFile.readAll().toStdString());
configFile.close();
this->projectConfig = ProjectConfig(configNode); this->projectConfig = ProjectConfig(configNode);
} catch (const YAML::Exception& exception) {
throw InvalidConfig(exception.msg);
}
// Validate the selected environment // Validate the selected environment
if (!this->projectConfig->environments.contains(this->selectedEnvironmentName)) { if (!this->projectConfig->environments.contains(this->selectedEnvironmentName)) {