Apps/ImageApi
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Just look for date format instead of screenshot text #40

Merged
cameron merged 1 commits from feature/fix-screenshot-date-regex into master 2025-09-01 15:15:50 +00:00
Conversation 0 Commits 1 Files Changed 1 +3 -3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2cc4124544 - Show all commits

6
src/memories.rs
View File

@@ -136,7 +136,7 @@ fn extract_date_from_filename(filename: &str) -> Option<DateTime<FixedOffset>> {
// 1. Screenshot format: Screenshot_2014-06-01-20-44-50.png // 1. Screenshot format: Screenshot_2014-06-01-20-44-50.png
if let Some(captures) = 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"(\d{4})-(\d{2})-(\d{2})-(\d{2})-(\d{2})-(\d{2})")
.ok()? .ok()?
.captures(filename) .captures(filename)
.and_then(|c| build_date_from_ymd_capture(&c)) .and_then(|c| build_date_from_ymd_capture(&c))
@@ -146,7 +146,7 @@ fn extract_date_from_filename(filename: &str) -> Option<DateTime<FixedOffset>> {
// Screenshot format: Screenshot_20140601[_-]204450.png // Screenshot format: Screenshot_20140601[_-]204450.png
if let Some(captures) = 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"(\d{4})(\d{2})(\d{2})[_-](\d{2})(\d{2})(\d{2})")
.ok()? .ok()?
.captures(filename) .captures(filename)
.and_then(|c| build_date_from_ymd_capture(&c)) .and_then(|c| build_date_from_ymd_capture(&c))
@@ -428,7 +428,7 @@ mod tests {
#[test] #[test]
fn test_extract_date_from_filename_screenshot_underscores_format() { fn test_extract_date_from_filename_screenshot_underscores_format() {
let filename = "Screenshot_20140601_204450.png"; let filename = "20140601_204450.png";
let date_time = extract_date_from_filename(filename).unwrap(); let date_time = extract_date_from_filename(filename).unwrap();
assert_eq!(date_time.year(), 2014); assert_eq!(date_time.year(), 2014);