lelgenio/maildir-notify-daemon
1
0
Fork 0
mirror of https://github.com/lelgenio/maildir-notify-daemon.git synced 2025-11-04 00:07:36 -03:00
Code Issues Projects Releases Packages Wiki Activity

fix reading invalid utf-8

Browse source
This commit is contained in:
lelgenio 2022-02-13 21:02:14 -03:00
parent 5cdd18fb72
commit 2bd4b95bf4
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/main.rs
View file

@ -16,9 +16,7 @@ fn main() {
.expect("hotwatch failed to initialize!");
std::env::args().for_each(|arg| {
hotwatch
.watch(arg, handle_event)
.expect("hotwatch failed to initialize!");
hotwatch.watch(arg, handle_event).ok();
});
hotwatch.run();
@ -33,7 +31,7 @@ fn handle_event(event: hotwatch::Event) -> hotwatch::blocking::Flow {
}
fn _handle_event(newfile: PathBuf) {
let raw_content = match std::fs::read_to_string(&newfile) {
let raw_content = match std::fs::read(&newfile) {
Ok(c) => c,
Err(e) => {
eprintln!(
@ -45,7 +43,7 @@ fn _handle_event(newfile: PathBuf) {
}
};
let mail_content = match mailparse::parse_mail(raw_content.as_bytes()) {
let mail_content = match mailparse::parse_mail(&raw_content) {
Ok(c) => c,
Err(e) => {
eprintln!(
@ -67,17 +65,16 @@ fn _handle_event(newfile: PathBuf) {
}
};
let subject = match headers.get_first_value("Subject") {
Some(sub) => sub,
None => mail_content
let subject = headers.get_first_value("Subject").unwrap_or_else(|| {
mail_content
.get_body()
.unwrap_or("".to_string())
.lines()
.filter(|line| line.len() != 0)
.next()
.unwrap_or("")
.to_string(),
};
.to_string()
});
Notification::new()
.summary(&format!("From: {}", from))