beenull/himalaya
1
0
Fork 0
mirror of https://github.com/soywod/himalaya.git synced 2024-11-25 04:20:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix back read -t html

Browse source
This commit is contained in:
Clément DOUIN 2023-05-30 23:07:10 +02:00
parent 65ac0c7702
commit 32b31db175
No known key found for this signature in database
GPG key ID: 353E4A18EE0FAB72
2 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Cargo.lock generated
View file

@ -52,9 +52,9 @@ dependencies = [
[[package]] [[package]]
name = "aho-corasick" name = "aho-corasick"
version = "0.7.20" version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
dependencies = [ dependencies = [
"memchr 2.5.0", "memchr 2.5.0",
] ]
@ -1668,6 +1668,12 @@ dependencies = [
"windows-sys 0.42.0", "windows-sys 0.42.0",
] ]
[[package]]
name = "nanohtml2text"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "999681fe3c0524336e98ece1c25ee4278607f25cc1e361ad0f9201c8bf56dc2c"
[[package]] [[package]]
name = "native-tls" name = "native-tls"
version = "0.2.11" version = "0.2.11"
@ -2062,7 +2068,7 @@ dependencies = [
[[package]] [[package]]
name = "pimalaya-email" name = "pimalaya-email"
version = "0.8.0" version = "0.8.0"
source = "git+https://git.sr.ht/~soywod/pimalaya#f62efe4f4f3fe4d1493056cef50d8ebdc28f681b" source = "git+https://git.sr.ht/~soywod/pimalaya#6767853528d75d8d0e6ff5e424dafea7351c3c94"
dependencies = [ dependencies = [
"advisory-lock", "advisory-lock",
"ammonia", "ammonia",
@ -2105,12 +2111,13 @@ dependencies = [
[[package]] [[package]]
name = "pimalaya-email-tpl" name = "pimalaya-email-tpl"
version = "0.2.0" version = "0.2.0"
source = "git+https://git.sr.ht/~soywod/pimalaya#f62efe4f4f3fe4d1493056cef50d8ebdc28f681b" source = "git+https://git.sr.ht/~soywod/pimalaya#6767853528d75d8d0e6ff5e424dafea7351c3c94"
dependencies = [ dependencies = [
"chumsky 0.9.0", "chumsky 0.9.0",
"log", "log",
"mail-builder", "mail-builder",
"mail-parser", "mail-parser",
"nanohtml2text",
"pimalaya-process", "pimalaya-process",
"shellexpand", "shellexpand",
"thiserror", "thiserror",
@ -2369,9 +2376,9 @@ dependencies = [
[[package]] [[package]]
name = "regex" name = "regex"
version = "1.7.0" version = "1.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
dependencies = [ dependencies = [
"aho-corasick", "aho-corasick",
"memchr 2.5.0", "memchr 2.5.0",
@ -2380,9 +2387,9 @@ dependencies = [
[[package]] [[package]]
name = "regex-syntax" name = "regex-syntax"
version = "0.6.28" version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
[[package]] [[package]]
name = "remove_dir_all" name = "remove_dir_all"

13
src/domain/email/handlers.rs
View file

@ -1,7 +1,9 @@
use anyhow::{anyhow, Context, Result}; use anyhow::{anyhow, Context, Result};
use atty::Stream; use atty::Stream;
use log::{debug, trace}; use log::{debug, trace};
use pimalaya_email::{AccountConfig, Backend, Email, EmailBuilder, Flag, Flags, Sender}; use pimalaya_email::{
AccountConfig, Backend, Email, EmailBuilder, FilterParts, Flag, Flags, Sender,
};
use std::{ use std::{
fs, fs,
io::{self, BufRead}, io::{self, BufRead},
@ -215,7 +217,7 @@ pub fn read<P: Printer>(
folder: &str, folder: &str,
ids: Vec<&str>, ids: Vec<&str>,
// TODO: map this to ShowTextsStrategy // TODO: map this to ShowTextsStrategy
_text_mime: &str, text_mime: &str,
_sanitize: bool, _sanitize: bool,
raw: bool, raw: bool,
headers: Vec<&str>, headers: Vec<&str>,
@ -237,7 +239,12 @@ pub fn read<P: Printer>(
bodies.push_str(&String::from_utf8_lossy(email.raw()?).into_owned()); bodies.push_str(&String::from_utf8_lossy(email.raw()?).into_owned());
} else { } else {
let tpl: String = email let tpl: String = email
.to_read_tpl(&config, |i| i.show_additional_headers(&headers))? .to_read_tpl(&config, |tpl| match text_mime {
"html" => tpl
.hide_all_headers()
.filter_parts(FilterParts::Only("text/html".into())),
_ => tpl.show_additional_headers(&headers),
})?
.into(); .into();
bodies.push_str(&tpl); bodies.push_str(&tpl);
} }