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

get signature from file (#135)

Browse Source
This commit is contained in:
Clément DOUIN
2021-05-04 16:19:06 +02:00
parent 9ba0c75c58
commit 435932a501
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config/model.rs
+13 -4
View File
@@ -2,7 +2,14 @@ use error_chain::error_chain;
use lettre::transport::smtp::authentication::Credentials as SmtpCredentials;
use log::debug;
use serde::Deserialize;
use std::{collections::HashMap, env, fs::File, io::Read, path::PathBuf, thread};
use std::{
collections::HashMap,
env,
fs::{self, File},
io::Read,
path::PathBuf,
thread,
};
use toml;
use crate::output::utils::run_cmd;
@@ -220,11 +227,13 @@ impl Config {
}
pub fn signature(&self, account: &Account) -> Option<String> {
account
let sig = account
.signature
.as_ref()
.or_else(|| self.signature.as_ref())
.map(|sig| sig.to_owned())
.or_else(|| self.signature.as_ref());
sig.and_then(|sig| fs::read_to_string(sig).ok())
.or_else(|| sig.map(|sig| sig.to_owned()))
}
pub fn default_page_size(&self, account: &Account) -> usize {