Merge pull request 'fix error on daylight saving time change' (#5) from handle_timechange into master
All checks were successful
continuous-integration/drone/push Build is passing

Reviewed-on: #5
This commit is contained in:
Paul 2023-11-01 11:44:57 +01:00
commit c1e8261d29

View File

@ -1,6 +1,7 @@
use crate::config::httpclient;
use crate::utils::gethostname;
use chrono::offset::LocalResult;
use chrono::prelude::*;
use ipnet::IpNet;
use lazy_static::lazy_static;
@ -156,16 +157,18 @@ fn parse_date(input: regex::Captures) -> DateTime<Local> {
hms.push(input.get(i).unwrap().as_str().parse::<u64>().unwrap());
}
let date = Local
.with_ymd_and_hms(
let date: DateTime<Local> = match Local.with_ymd_and_hms(
ymd[0] as i32,
ymd[1] as u32,
ymd[2] as u32,
hms[0] as u32,
hms[1] as u32,
hms[2] as u32,
)
.unwrap();
) {
LocalResult::Single(s) => s,
LocalResult::Ambiguous(a, _b) => a,
LocalResult::None => Local::now(),
};
date
}