matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Merge pull request #1303 from matthiasbeyer/imag-diary/fix-list-diary-name-passing

Browse source 
Fix order of evaluation
This commit is contained in:
Matthias Beyer 2018-02-20 18:37:55 +01:00 committed by GitHub
commit c2b754dbec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bin/domain/imag-diary/src/util.rs
View file

@ -26,8 +26,10 @@ use toml_query::read::TomlValueReadExt;
pub fn get_diary_name(rt: &Runtime) -> Option<String> { pub fn get_diary_name(rt: &Runtime) -> Option<String> {
use libimagdiary::config::get_default_diary_name; use libimagdiary::config::get_default_diary_name;
get_default_diary_name(rt) rt.cli()
.or(rt.cli().value_of("diaryname").map(String::from)) .value_of("diaryname")
.map(String::from)
.or_else(|| get_default_diary_name(rt))
} }
pub enum Timed { pub enum Timed {