github/himalaya
1
0
Fork 0
mirror of https://github.com/pimalaya/himalaya.git synced 2026-06-17 05:07:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

expand tilde in config file (#102)

Browse Source
This commit is contained in:
Clément DOUIN
2021-08-05 23:18:28 +02:00
parent a6b30b746c
commit 97054d3133
4 changed files with 59 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config/model.rs
+15 -4
View File
@@ -2,6 +2,7 @@ use error_chain::error_chain;
use lettre::transport::smtp::authentication::Credentials as SmtpCredentials;
use log::debug;
use serde::Deserialize;
use shellexpand;
use std::{
collections::HashMap,
env,
@@ -230,8 +231,17 @@ impl Config {
account
.downloads_dir
.as_ref()
.unwrap_or(self.downloads_dir.as_ref().unwrap_or(&env::temp_dir()))
.to_owned()
.and_then(|dir| dir.to_str())
.and_then(|dir| shellexpand::full(dir).ok())
.map(|dir| PathBuf::from(dir.to_string()))
.unwrap_or(
self.downloads_dir
.as_ref()
.and_then(|dir| dir.to_str())
.and_then(|dir| shellexpand::full(dir).ok())
.map(|dir| PathBuf::from(dir.to_string()))
.unwrap_or(env::temp_dir()),
)
.join(filename)
}
@@ -264,8 +274,9 @@ impl Config {
.signature
.as_ref()
.or_else(|| self.signature.as_ref());
sig.and_then(|sig| fs::read_to_string(sig).ok())
sig.and_then(|sig| shellexpand::full(sig).ok())
.map(|sig| sig.to_string())
.and_then(|sig| fs::read_to_string(sig).ok())
.or_else(|| sig.map(|sig| sig.to_owned()))
.map(|sig| String::new() + sig_delim + sig.as_ref())
}