From edd2b0f7c81c692d85317b1b28be066832694e14 Mon Sep 17 00:00:00 2001
From: ipconfiger <superpowerlee@gmail.com>
Date: Mon, 3 Apr 2023 23:31:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=82=E5=B8=B8=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cargo.lock  |  2 +-
 Cargo.toml  |  2 +-
 src/main.rs | 16 +++++++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0d4a911..aeaed35 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -172,7 +172,7 @@ dependencies = [
 
 [[package]]
 name = "cron_trigger"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
  "chrono",
  "clap",
diff --git a/Cargo.toml b/Cargo.toml
index b6ce73c..a78c4cb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cron_trigger"
-version = "0.1.3"
+version = "0.1.4"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/src/main.rs b/src/main.rs
index b5b2ff4..2310ea3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,6 +3,7 @@ use tokio::fs::File;
 use tokio::io::{self, AsyncBufReadExt, BufReader};
 use chrono::{DateTime, Utc};
 use std::str::FromStr;
+use std::panic;
 use std::env;
 use std::path::{Path, PathBuf};
 use std::process::Command;
@@ -36,9 +37,9 @@ fn send_web(to_addr: String, content: String) {
 
 fn send_mail(config: &Config, to_addr: String, title: String, content: String) {
     // 设置发件人邮箱地址
-    let from = config.from_addr.parse().unwrap();
+    let from = config.from_addr.parse().expect("Invalid from addr");
     // 设置收件人邮箱地址
-    let to = to_addr.parse().unwrap();
+    let to = to_addr.parse().expect("Invalid target addr");
     // 创建邮件
     let email = Message::builder()
         .from(from)
@@ -46,7 +47,7 @@ fn send_mail(config: &Config, to_addr: String, title: String, content: String) {
         .subject(title)
         .header(ContentType::TEXT_PLAIN)
         .body(content)
-        .unwrap();
+        .expect("Invalid mail");
     // 设置SMTP服务器地址和端口号
     let smtp_server = config.smtp.clone();
     let smtp_port = config.smtp_port;
@@ -56,7 +57,7 @@ fn send_mail(config: &Config, to_addr: String, title: String, content: String) {
     
     // 创建SMTP传输对象
     let smtp_transport = SmtpTransport::starttls_relay(smtp_server.as_str())
-        .unwrap()
+        .expect("create mail transport error!")
         .credentials(Credentials::new(username.to_string(), password.to_string()))
         .port(smtp_port).build();
     // 发送邮件
@@ -144,7 +145,12 @@ fn send_notification(config_path: PathBuf, title: &str, body: &str) {
             },
             "mail"=>{
                 println!("get mail hook, send mail");
-                send_mail(&config, item.address.clone(), title.to_string(), body.to_string());
+                let result = panic::catch_unwind(|| {
+                    send_mail(&config, item.address.clone(), title.to_string(), body.to_string());
+                });
+                if let Err(err) = result {
+                    println!("Caught a panic: {:?}", err);
+                }
             },
             _=>{}
         }