mirror of
https://github.com/KingDuckZ/dindexer.git
synced 2025-08-23 16:10:51 +00:00
Clean up code to handle failed attempts at loading backend plugins.
This commit is contained in:
parent
7de71943ad
commit
61b0b586cf
7 changed files with 74 additions and 63 deletions
|
@ -26,7 +26,6 @@
|
|||
#include <ciso646>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <cassert>
|
||||
#include <boost/range/algorithm/copy.hpp>
|
||||
|
||||
namespace {
|
||||
|
@ -52,16 +51,14 @@ int main (int parArgc, char* parArgv[]) {
|
|||
}
|
||||
|
||||
dinlib::Settings settings;
|
||||
{
|
||||
const bool loaded = dinlib::load_settings(CONFIG_FILE_PATH, settings);
|
||||
if (not loaded) {
|
||||
std::cerr << "Can't load settings from " << CONFIG_FILE_PATH << ", quitting\n";
|
||||
return 1;
|
||||
}
|
||||
try {
|
||||
dinlib::load_settings(CONFIG_FILE_PATH, settings);
|
||||
}
|
||||
catch (const std::runtime_error& err) {
|
||||
std::cerr << "Can't load settings from " << CONFIG_FILE_PATH << ":\n";
|
||||
std::cerr << err.what() << '\n';
|
||||
return 1;
|
||||
}
|
||||
//TODO: throw if plugin loading failed
|
||||
assert(settings.backend_plugin.name() == settings.backend_name);
|
||||
assert(settings.backend_plugin.is_loaded());
|
||||
|
||||
do_navigation(settings.backend_plugin.backend());
|
||||
return 0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue