paulbsd/ipblc
1
0
Fork 0
Code Issues Pull Requests Projects Releases 15 Wiki Activity

fix error on daylight saving time change #5

Merged
paulbsd merged 1 commits from handle_timechange into master 2023-11-01 11:44:58 +01:00
Conversation 0 Commits 1 Files Changed 1 +13 -10
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e5444dde72 - Show all commits

11
src/ip.rs
View File

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