From c8041bacd672f4e0f66af7130738e9358989da0e Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Tue, 27 Jan 2015 16:57:50 +0100 Subject: [PATCH] renamed: Util/IniFileUtil.h -> Util/ini_file.hpp --- Util/DataStoreOptions.h | 30 +++++++++++----------------- Util/ProgramOptions.h | 4 ++-- Util/{IniFileUtil.h => ini_file.hpp} | 26 +++++++++++++----------- extractor/extractor.cpp | 4 +++- extractor/extractor_options.cpp | 4 ++-- 5 files changed, 33 insertions(+), 35 deletions(-) rename Util/{IniFileUtil.h => ini_file.hpp} (74%) diff --git a/Util/DataStoreOptions.h b/Util/DataStoreOptions.h index 0ad3222fc..c1435e29b 100644 --- a/Util/DataStoreOptions.h +++ b/Util/DataStoreOptions.h @@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "BoostFileSystemFix.h" #include "git_sha.hpp" -#include "IniFileUtil.h" +#include "ini_file.hpp" #include "osrm_exception.hpp" #include "simple_logger.hpp" @@ -47,34 +47,29 @@ bool GenerateDataStoreOptions(const int argc, const char *argv[], ServerPaths &p { // declare a group of options that will be allowed only on command line boost::program_options::options_description generic_options("Options"); - generic_options.add_options()("version,v", "Show version")("help,h", "Show this help message") - ("springclean,s", "Remove all regions in shared memory")("config,c", - boost::program_options::value(&paths["config"]) - ->default_value("server.ini"), + generic_options.add_options()("version,v", "Show version")("help,h", "Show this help message")( + "springclean,s", "Remove all regions in shared memory")( + "config,c", boost::program_options::value(&paths["config"]) + ->default_value("server.ini"), "Path to a configuration file"); // declare a group of options that will be allowed both on command line // as well as in a config file boost::program_options::options_description config_options("Configuration"); config_options.add_options()( - "hsgrdata", - boost::program_options::value(&paths["hsgrdata"]), + "hsgrdata", boost::program_options::value(&paths["hsgrdata"]), ".hsgr file")("nodesdata", boost::program_options::value(&paths["nodesdata"]), ".nodes file")( - "edgesdata", - boost::program_options::value(&paths["edgesdata"]), + "edgesdata", boost::program_options::value(&paths["edgesdata"]), ".edges file")("geometry", boost::program_options::value(&paths["geometry"]), ".geometry file")( - "ramindex", - boost::program_options::value(&paths["ramindex"]), + "ramindex", boost::program_options::value(&paths["ramindex"]), ".ramIndex file")( - "fileindex", - boost::program_options::value(&paths["fileindex"]), + "fileindex", boost::program_options::value(&paths["fileindex"]), ".fileIndex file")( - "namesdata", - boost::program_options::value(&paths["namesdata"]), + "namesdata", boost::program_options::value(&paths["namesdata"]), ".names file")("timestamp", boost::program_options::value(&paths["timestamp"]), ".timestamp file"); @@ -83,8 +78,7 @@ bool GenerateDataStoreOptions(const int argc, const char *argv[], ServerPaths &p // file, but will not be shown to the user boost::program_options::options_description hidden_options("Hidden options"); hidden_options.add_options()( - "base,b", - boost::program_options::value(&paths["base"]), + "base,b", boost::program_options::value(&paths["base"]), "base path to .osrm file"); // positional option @@ -157,7 +151,7 @@ bool GenerateDataStoreOptions(const int argc, const char *argv[], ServerPaths &p !option_variables.count("base")) { SimpleLogger().Write() << "Reading options from: " << path_iterator->second.string(); - std::string ini_file_contents = ReadIniFileAndLowerContents(path_iterator->second); + std::string ini_file_contents = read_file_lower_content(path_iterator->second); std::stringstream config_stream(ini_file_contents); boost::program_options::store(parse_config_file(config_stream, config_file_options), option_variables); diff --git a/Util/ProgramOptions.h b/Util/ProgramOptions.h index 0c350fc75..55ee99539 100644 --- a/Util/ProgramOptions.h +++ b/Util/ProgramOptions.h @@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define PROGAM_OPTIONS_H #include "git_sha.hpp" -#include "IniFileUtil.h" +#include "ini_file.hpp" #include "osrm_exception.hpp" #include "simple_logger.hpp" @@ -244,7 +244,7 @@ inline unsigned GenerateServerProgramOptions(const int argc, !option_variables.count("base")) { SimpleLogger().Write() << "Reading options from: " << path_iterator->second.string(); - std::string ini_file_contents = ReadIniFileAndLowerContents(path_iterator->second); + std::string ini_file_contents = read_file_lower_content(path_iterator->second); std::stringstream config_stream(ini_file_contents); boost::program_options::store(parse_config_file(config_stream, config_file_options), option_variables); diff --git a/Util/IniFileUtil.h b/Util/ini_file.hpp similarity index 74% rename from Util/IniFileUtil.h rename to Util/ini_file.hpp index ea1d7a13b..20616257a 100644 --- a/Util/IniFileUtil.h +++ b/Util/ini_file.hpp @@ -1,6 +1,6 @@ /* -Copyright (c) 2013, Project OSRM, Dennis Luxen, others +Copyright (c) 2015, Project OSRM, Dennis Luxen, others All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -25,25 +25,27 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef INI_FILE_UTIL_H -#define INI_FILE_UTIL_H +#ifndef INI_FILE_HPP +#define INI_FILE_HPP #include #include -#include -#include +#include #include +namespace +{ + // support old capitalized option names by down-casing them with a regex replace -inline std::string ReadIniFileAndLowerContents(const boost::filesystem::path &path) +std::string read_file_lower_content(const boost::filesystem::path &path) { boost::filesystem::fstream config_stream(path); std::string ini_file_content((std::istreambuf_iterator(config_stream)), - std::istreambuf_iterator()); - boost::regex regex( "^([^=]*)" ); //match from start of line to '=' - std::string format( "\\L$1\\E" ); //replace with downcased substring - return boost::regex_replace( ini_file_content, regex, format ); + std::istreambuf_iterator()); + std::transform(std::begin(ini_file_content), std::end(ini_file_content), + std::begin(ini_file_content), ::tolower); + return ini_file_content; } - -#endif // INI_FILE_UTIL_H +} +#endif // INI_FILE_HPP diff --git a/extractor/extractor.cpp b/extractor/extractor.cpp index a4c31e04e..c4e7203f5 100644 --- a/extractor/extractor.cpp +++ b/extractor/extractor.cpp @@ -35,7 +35,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "scripting_environment.hpp" #include "../Util/git_sha.hpp" -#include "../Util/IniFileUtil.h" #include "../Util/make_unique.hpp" #include "../Util/simple_logger.hpp" #include "../Util/timing_util.hpp" @@ -46,6 +45,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include +#include +#include + #include #include diff --git a/extractor/extractor_options.cpp b/extractor/extractor_options.cpp index 6514ef647..68a905a22 100644 --- a/extractor/extractor_options.cpp +++ b/extractor/extractor_options.cpp @@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "extractor_options.hpp" #include "../Util/git_sha.hpp" -#include "../Util/IniFileUtil.h" +#include "../Util/ini_file.hpp" #include "../Util/simple_logger.hpp" #include @@ -108,7 +108,7 @@ ExtractorOptions::ParseArguments(int argc, char *argv[], ExtractorConfig &extrac SimpleLogger().Write() << "Reading options from: " << extractor_config.config_file_path.string(); std::string ini_file_contents = - ReadIniFileAndLowerContents(extractor_config.config_file_path); + read_file_lower_content(extractor_config.config_file_path); std::stringstream config_stream(ini_file_contents); boost::program_options::store(parse_config_file(config_stream, config_file_options), option_variables);