Skip to content

added the possibility to load multiple INI files #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added the possibility to load multiple INI files #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ link_directories(
file(GLOB CAPI_SRCS "src/CommonAPI/*.cpp")
list(SORT CAPI_SRCS)
add_library(CommonAPI SHARED ${CAPI_SRCS})
target_link_libraries(CommonAPI PRIVATE ${DL_LIBRARY} ${DLT_LIBRARIES})
target_link_libraries(CommonAPI PRIVATE ${DL_LIBRARY} ${DLT_LIBRARIES} stdc++fs)
set_target_properties(CommonAPI PROPERTIES VERSION ${LIBCOMMONAPI_MAJOR_VERSION}.${LIBCOMMONAPI_MINOR_VERSION}.${LIBCOMMONAPI_PATCH_VERSION} SOVERSION ${LIBCOMMONAPI_MAJOR_VERSION}.${LIBCOMMONAPI_MINOR_VERSION}.${LIBCOMMONAPI_PATCH_VERSION} LINKER_LANGUAGE C)
set_target_properties (CommonAPI PROPERTIES INTERFACE_LINK_LIBRARY "")

Expand Down
84 changes: 42 additions & 42 deletions src/CommonAPI/IniFileReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,50 +45,50 @@ IniFileReader::load(const std::string &_path) {

trim(line);

std::size_t start = line.find('[');
if (start == 0) {
std::size_t end = line.find(']');
if (end != line.npos) {
currentSectionName = line.substr(++start, --end);
if (sections_.end() == sections_.find(currentSectionName)) {
currentSection = std::make_shared<Section>();
if (currentSection) {
sections_[currentSectionName] = currentSection;
if (!line.empty()) {
if (line.front() != ';') {
std::size_t start = line.find('[');
if (start == 0) {
std::size_t end = line.find(']');
if (end != line.npos) {
currentSectionName = line.substr(++start, --end);
auto currentSectionIt = sections_.find(currentSectionName);
if (sections_.end() == currentSectionIt) {
currentSection = std::make_shared<Section>();
if (currentSection) {
sections_[currentSectionName] = currentSection;
}
} else {
currentSection = currentSectionIt->second;
}
} else {
COMMONAPI_ERROR("Missing \']\' in section definition (line ",
lineCounter, ")");
}
} else if (currentSection) {
std::size_t pos = line.find('=');
if (pos != line.npos) {
std::string key = line.substr(0, pos);
trim(key);
if (currentSection->mappings_.end()
!= currentSection->mappings_.find(key)) {
COMMONAPI_ERROR("Double definition for key \'",
key,
"'\' in section \'",
currentSectionName,
"\' (line ",
lineCounter,
")");
} else {
std::string value = line.substr(pos+1);
trim(value);
currentSection->mappings_[key] = value;
}
} else if (line.size() > 0) {
COMMONAPI_ERROR("Missing \'=\' in key=value definition (line ",
lineCounter, ")");
}
} else {
COMMONAPI_ERROR("Double definition of section \'",
currentSectionName,
"\' ignoring definition (line ",
lineCounter,
")");
currentSection = nullptr;
}
} else {
COMMONAPI_ERROR("Missing \']\' in section definition (line ",
lineCounter, ")");
}
} else if (currentSection) {
std::size_t pos = line.find('=');
if (pos != line.npos) {
std::string key = line.substr(0, pos);
trim(key);
if (currentSection->mappings_.end()
!= currentSection->mappings_.find(key)) {
COMMONAPI_ERROR("Double definition for key \'",
key,
"'\' in section \'",
currentSectionName,
"\' (line ",
lineCounter,
")");
} else {
std::string value = line.substr(pos+1);
trim(value);
currentSection->mappings_[key] = value;
}
} else if (line.size() > 0) {
COMMONAPI_ERROR("Missing \'=\' in key=value definition (line ",
lineCounter, ")");
}
}
}
Expand Down
82 changes: 61 additions & 21 deletions src/CommonAPI/Runtime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,21 @@
#include <CommonAPI/Logger.hpp>
#include <CommonAPI/Runtime.hpp>

#if defined __cpp_lib_filesystem
#include <filesystem>
namespace fs_ns = std::filesystem;
#else
#include <experimental/filesystem>
namespace fs_ns = std::experimental::filesystem;
#endif

namespace CommonAPI {

const char *COMMONAPI_DEFAULT_BINDING = "dbus";
const char *COMMONAPI_DEFAULT_FOLDER = "/usr/local/lib/commonapi";
const char *COMMONAPI_DEFAULT_CONFIG_FILE = "commonapi.ini";
const char *COMMONAPI_DEFAULT_CONFIG_FOLDER = "/etc";
const char *COMMONAPI_DEFAULT_MULTIPLE_CONFIGS_FOLDER = "/etc/commonapi.d";

std::map<std::string, std::string> properties__;
static std::shared_ptr<Runtime> * theRuntimePtr__;
Expand Down Expand Up @@ -126,14 +135,29 @@ void Runtime::init() {
std::lock_guard<std::mutex> itsLock(mutex_);
#endif
if (!isConfigured_) {
// Determine default configuration file
// Determine default configuration file/folder
defaultConfig_ = COMMONAPI_DEFAULT_MULTIPLE_CONFIGS_FOLDER;

const char *config = getenv("COMMONAPI_CONFIG");
if (config) {
defaultConfig_ = config;
} else {
defaultConfig_ = COMMONAPI_DEFAULT_CONFIG_FOLDER;
defaultConfig_ += "/";
defaultConfig_ += COMMONAPI_DEFAULT_CONFIG_FILE;
}

// Check if there is a configuration folder:
if (fs_ns::exists(defaultConfig_)
&& fs_ns::is_directory(defaultConfig_)
&& !fs_ns::is_empty(defaultConfig_))
{

}
else
{
if (!config)
{
defaultConfig_ = COMMONAPI_DEFAULT_CONFIG_FOLDER;
defaultConfig_ += "/";
defaultConfig_ += COMMONAPI_DEFAULT_CONFIG_FILE;
}
}

// TODO: evaluate return parameter and decide what to do
Expand Down Expand Up @@ -172,31 +196,47 @@ Runtime::initFactories() {

bool
Runtime::readConfiguration() {
IniFileReader reader;
// Reading a complete folder:
if (fs_ns::is_directory(defaultConfig_))
{
usedConfig_ = defaultConfig_;

for (auto &dirEntry : fs_ns::directory_iterator(usedConfig_))
{
if (!fs_ns::is_directory(dirEntry.path().string()))
{
reader.load(dirEntry.path().string());
}
}
}
else
{
#define MAX_PATH_LEN 255
std::string config;
bool tryLoadConfig(true);
char currentDirectory[MAX_PATH_LEN];
std::string config;
bool tryLoadConfig(true);
char currentDirectory[MAX_PATH_LEN];
#ifdef _WIN32
if (GetCurrentDirectory(MAX_PATH_LEN, currentDirectory)) {
if (GetCurrentDirectory(MAX_PATH_LEN, currentDirectory)) {
#else
if (getcwd(currentDirectory, MAX_PATH_LEN)) {
if (getcwd(currentDirectory, MAX_PATH_LEN)) {
#endif
usedConfig_ = currentDirectory;
usedConfig_ += "/";
usedConfig_ += COMMONAPI_DEFAULT_CONFIG_FILE;
usedConfig_ = currentDirectory;
usedConfig_ += "/";
usedConfig_ += COMMONAPI_DEFAULT_CONFIG_FILE;

struct stat s;
if (stat(usedConfig_.c_str(), &s) != 0) {
usedConfig_ = defaultConfig_;
struct stat s;
if (stat(usedConfig_.c_str(), &s) != 0) {
tryLoadConfig = false;
usedConfig_ = defaultConfig_;
if (stat(usedConfig_.c_str(), &s) != 0) {
tryLoadConfig = false;
}
}
}
}

IniFileReader reader;
if (tryLoadConfig && !reader.load(usedConfig_))
return false;
if (tryLoadConfig && !reader.load(usedConfig_))
return false;
}

std::string itsConsole("true");
std::string itsFile;
Expand Down