From 557ada4ee23af8aafdd751bbba3ab5f3f8d8d24b Mon Sep 17 00:00:00 2001 From: Ash Vollmer Date: Wed, 5 Aug 2026 21:41:48 +0200 Subject: [PATCH] fixed regex (kms) and added trim --- src/models.rs | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/src/models.rs b/src/models.rs index a80fcf1..b281c10 100644 --- a/src/models.rs +++ b/src/models.rs @@ -39,24 +39,33 @@ impl Notice { pub fn get_validity_period(&mut self) { let re = Regex::new( - r"Gültig ab (\d{2}\.\d{2}\.\d{4} \d{2}:\d{2}) bis (\d{2}\.\d{2}\.\d{4} \d{2}:\d{2})", + r"Gültig ab (\d{2}\.\d{2}\.\d{4} \d{2}:\d{2})(?: bis (\d{2}\.\d{2}\.\d{4} \d{2}:\d{2}))?(?:
|\s)*", ) .unwrap(); + let format = "%d.%m.%Y %H:%M"; + if let Some(caps) = re.captures(&self.detail) { let valid_from = caps.get(1).unwrap().as_str(); - let valid_to = caps.get(1).unwrap().as_str(); - let format = "%d.%m.%Y %H:%M"; - - if let (Ok(start_dt), Ok(end_dt)) = ( - NaiveDateTime::parse_from_str(valid_from, format), - NaiveDateTime::parse_from_str(valid_to, format), - ) { + if let Ok(start_dt) = NaiveDateTime::parse_from_str(valid_from, format) { self.from = Some(start_dt); - self.to = Some(end_dt); + } + + if let Some(valid_to_match) = caps.get(2) { + let valid_to = valid_to_match.as_str(); + if let Ok(end_dt) = NaiveDateTime::parse_from_str(valid_to, format) { + self.to = Some(end_dt); + } + self.detail = re.replace(&self.detail, "").to_string(); + self.trim(); + } else { + self.to = None; } } else { println!("No validity period found in the text."); } } + pub fn trim(&mut self) { + self.detail = self.detail.replace("
", "\n"); + } }