NotificationsYou must be signed in to change notification settings
Fork9
Star16

Commitd83d3bc

authored

Merge pull request#8 from TUM-I5/davschneller/local-env

Localize environment variable reader

2 parents14aad21 +5412a89 commitd83d3bcCopy full SHA for d83d3bc

File tree

3 files changed

+18

-12

lines changed

3 files changed

+18

-12

lines changed

`‎env.h`

Lines changed: 8 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,16 @@ namespace utils {`
`23`	`23`	`*/`
`24`	`24`	`classEnv {`
`25`	`25`	`private:`
`26`		`-staticinline std::unordered_map<std::string, std::optional<std::string>> cache;`
	`26`	`+ std::string prefix;`
	`27`	`+ std::unordered_map<std::string, std::optional<std::string>> cache;`
`27`	`28`
`28`	`29`	`public:`
	`30`	`+Env(const std::string& prefix) : prefix(prefix) {}`
	`31`	`+`
`29`	`32`	`template<typename T>`
`30`		`-staticautogetOptional(const std::string& name) -> std::optional<T> {`
	`33`	`+autogetOptional(const std::string& name) -> std::optional<T> {`
`31`	`34`	`if (cache.find(name) == cache.end()) {`
`32`		`-char* value =std::getenv(name.c_str());`
	`35`	`+char* value =std::getenv((prefix +name).c_str());`
`33`	`36`	`if (value ==nullptr) {`
`34`	`37`	`cache[name] = std::optional<std::string>();`
`35`	`38`	`}else {`
`@@ -46,7 +49,7 @@ class Env {`
`46`	`49`	`}`
`47`	`50`
`48`	`51`	`template<typename T>`
`49`		`-staticautoget(const std::string& name, T&& defaultVal)`
	`52`	`+autoget(const std::string& name, T&& defaultVal)`
`50`	`53`	`-> std::enable_if_t<!std::is_array_v<T>, std::decay_t<T>> {`
`51`	`54`	`// mirror requirements for an optional`
`52`	`55`	`constauto value = getOptional<std::decay_t<T>>(name);`
`@@ -59,7 +62,7 @@ class Env {`
`59`	`62`	`}`
`60`	`63`
`61`	`64`	`template<typename T>`
`62`		`-staticautoget(const std::string& name,const T* defaultVal)`
	`65`	`+autoget(const std::string& name,const T* defaultVal)`
`63`	`66`	`-> std::enable_if_t<std::is_convertible_v<T*, std::string>, std::string> {`
`64`	`67`	`constauto value = getOptional<std::string>(name);`
`65`	`68`

`‎progress.h`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,9 +53,11 @@ class Progress {`
`53`	`53`	`/** TTY handle (if used)*/`
`54`	`54`	`std::ofstream m_tty;`
`55`	`55`
	`56`	`+ Env env{"UTILS_PROGRESS_"};`
	`57`	`+`
`56`	`58`	`public:`
`57`	`59`	`Progress(unsignedlong total =100) {`
`58`		`- std::string envOutput =Env::get<std::string>("UTILS_PROGRESS_OUTPUT","STDERR");`
	`60`	`+ std::string envOutput =env.get<std::string>("OUTPUT","STDERR");`
`59`	`61`
`60`	`62`	`StringUtils::toUpper(envOutput);`
`61`	`63`
`@@ -172,7 +174,7 @@ class Progress {`
`172`	`174`	`*/`
`173`	`175`	`voidsetSize(bool automatic =true) {`
`174`	`176`	`// Check if size is set in env`
`175`		`-constunsignedlongsize =Env::get<unsignedlong>("UTILS_PROGRESS_SIZE",0);`
	`177`	`+constautosize =env.get<unsignedlong>("SIZE",0);`
`176`	`178`
`177`	`179`	`if (size >0) {`
`178`	`180`	`m_barSize = size;`

`‎tests/env.t.h`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,15 +17,16 @@ using namespace utils;`
`17`	`17`	`classTestEnv :publicCxxTest::TestSuite {`
`18`	`18`	`public:`
`19`	`19`	`staticvoidtestGet() {`
	`20`	`+ Envenv("UTILS_");`
`20`	`21`	`TS_ASSERT_EQUALS(setenv("UTILS_INT","42",1),0);`
`21`		`-TS_ASSERT_EQUALS(Env::get<int>("UTILS_INT",0),42);`
`22`		`-TS_ASSERT_EQUALS(Env::get("UTILS_INT","0"),std::string("42"));`
`23`		`-TS_ASSERT_EQUALS(Env::get<int>("UTILS_INT2",3),3);`
	`22`	`+TS_ASSERT_EQUALS(env.get<int>("INT",0),42);`
	`23`	`+TS_ASSERT_EQUALS(env.get("INT","0"),std::string("42"));`
	`24`	`+TS_ASSERT_EQUALS(env.get<int>("INT2",3),3);`
`24`	`25`
`25`	`26`	`TS_ASSERT_EQUALS(setenv("UTILS_BOOL","1",1),0);`
`26`		`-TS_ASSERT_EQUALS(Env::get<bool>("UTILS_BOOL",false),true);`
	`27`	`+TS_ASSERT_EQUALS(env.get<bool>("BOOL",false),true);`
`27`	`28`	`TS_ASSERT_EQUALS(setenv("UTILS_BOOL2","0",1),0);`
`28`		`-TS_ASSERT_EQUALS(Env::get<bool>("UTILS_BOOL2",false),false);`
	`29`	`+TS_ASSERT_EQUALS(env.get<bool>("BOOL2",false),false);`
`29`	`30`	`}`
`30`	`31`	`};`
`31`	`32`	`#endif// UTILS_TESTS_ENV_T_H_`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitd83d3bc

File tree

3 files changed

3 files changed

`‎env.h`

`‎progress.h`

`‎tests/env.t.h`

0 commit comments