From 6f76a74b2e1959fcb669f5326325b2d96ed214cb Mon Sep 17 00:00:00 2001 From: Cameron Date: Mon, 1 Sep 2025 11:09:09 -0400 Subject: [PATCH] Add additional memories filename regex --- src/memories.rs | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/memories.rs b/src/memories.rs index 8549ae5..0610c21 100644 --- a/src/memories.rs +++ b/src/memories.rs @@ -144,9 +144,9 @@ fn extract_date_from_filename(filename: &str) -> Option> { return Some(captures); } - // Screenshot format: Screenshot_20140601-204450.png + // Screenshot format: Screenshot_20140601[_-]204450.png if let Some(captures) = - regex::Regex::new(r"Screenshot_(\d{4})(\d{2})(\d{2})-(\d{2})(\d{2})(\d{2})") + regex::Regex::new(r"Screenshot_(\d{4})(\d{2})(\d{2})[_-](\d{2})(\d{2})(\d{2})") .ok()? .captures(filename) .and_then(|c| build_date_from_ymd_capture(&c)) @@ -426,6 +426,19 @@ mod tests { assert_eq!(date_time.second(), 50); } + #[test] + fn test_extract_date_from_filename_screenshot_underscores_format() { + let filename = "Screenshot_20140601_204450.png"; + let date_time = extract_date_from_filename(filename).unwrap(); + + assert_eq!(date_time.year(), 2014); + assert_eq!(date_time.month(), 6); + assert_eq!(date_time.day(), 1); + assert_eq!(date_time.hour(), 20); + assert_eq!(date_time.minute(), 44); + assert_eq!(date_time.second(), 50); + } + #[test] fn test_extract_date_from_filename_dash_format() { let filename = "2015-01-09_02-15-15.jpg";