beenull/himalaya
1
0
Fork 0
mirror of https://github.com/soywod/himalaya.git synced 2024-07-08 18:45:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve msg date readable format

Browse source
This commit is contained in:
Clément DOUIN 2022-03-12 17:45:56 +01:00
parent 1d969a0d3a
commit e5413fb902
No known key found for this signature in database
GPG key ID: 353E4A18EE0FAB72
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/msg/msg_entity.rs
View file

@ -1,6 +1,6 @@
use ammonia; use ammonia;
use anyhow::{anyhow, Context, Error, Result}; use anyhow::{anyhow, Context, Error, Result};
use chrono::{DateTime, FixedOffset}; use chrono::{DateTime, Local, TimeZone, Utc};
use convert_case::{Case, Casing}; use convert_case::{Case, Casing};
use html_escape; use html_escape;
use lettre::message::{header::ContentType, Attachment, MultiPart, SinglePart}; use lettre::message::{header::ContentType, Attachment, MultiPart, SinglePart};
@ -31,8 +31,6 @@ use crate::{
}, },
}; };
const DATE_TIME_FORMAT: &str = "%d-%b-%Y %H:%M:%S %z";
/// Representation of a message. /// Representation of a message.
#[derive(Debug, Clone, Default)] #[derive(Debug, Clone, Default)]
pub struct Msg { pub struct Msg {
@ -56,7 +54,7 @@ pub struct Msg {
/// The internal date of the message. /// The internal date of the message.
/// ///
/// [RFC3501]: https://datatracker.ietf.org/doc/html/rfc3501#section-2.3.3 /// [RFC3501]: https://datatracker.ietf.org/doc/html/rfc3501#section-2.3.3
pub date: Option<DateTime<FixedOffset>>, pub date: Option<DateTime<Local>>,
pub parts: Parts, pub parts: Parts,
pub encrypt: bool, pub encrypt: bool,
@ -234,7 +232,7 @@ impl Msg {
let date = self let date = self
.date .date
.as_ref() .as_ref()
.map(|date| date.format("%d %b %Y, at %H:%M").to_string()) .map(|date| date.format("%d %b %Y, at %H:%M (%z)").to_string())
.unwrap_or_else(|| "unknown date".into()); .unwrap_or_else(|| "unknown date".into());
let sender = self let sender = self
.reply_to .reply_to
@ -675,14 +673,15 @@ impl Msg {
"subject" => { "subject" => {
msg.subject = val; msg.subject = val;
} }
"date" => { "date" => match mailparse::dateparse(&val) {
msg.date = DateTime::parse_from_str(&val, DATE_TIME_FORMAT) Ok(timestamp) => {
.map_err(|err| { msg.date = Some(Utc.timestamp(timestamp, 0).with_timezone(&Local))
warn!("cannot parse message date {:?}, skipping it", val); }
err Err(err) => {
}) warn!("cannot parse message date {:?}, skipping it", val);
.ok(); warn!("{}", err);
} }
},
"from" => { "from" => {
msg.from = from_slice_to_addrs(val) msg.from = from_slice_to_addrs(val)
.context(format!("cannot parse header {:?}", key))? .context(format!("cannot parse header {:?}", key))?
@ -762,7 +761,7 @@ impl Msg {
} }
"date" => { "date" => {
if let Some(ref date) = self.date { if let Some(ref date) = self.date {
readable_msg.push_str(&format!("Date: {}\n", date)); readable_msg.push_str(&format!("Date: {}\n", date.to_rfc2822()));
} }
} }
"from" => match self.from { "from" => match self.from {