Fix tests and improve memories date error log

This commit is contained in:
Cameron
2025-12-19 14:20:51 -05:00
parent e3ccc123d0
commit df94010d21
5 changed files with 24 additions and 7 deletions

View File

@@ -379,7 +379,7 @@ fn collect_exif_memories(
let file_date = timestamp_to_naive_date(*date_taken_ts, client_timezone)?;
// Check if matches memory criteria
if !is_memories_match(file_date, now, span_mode, years_back) {
if !is_memories_match(file_path, file_date, now, span_mode, years_back) {
return None;
}
@@ -438,7 +438,13 @@ fn collect_filesystem_memories(
// Use existing get_file_date_info() for filename/metadata fallback
let (file_date, created, modified) = get_file_date_info(entry.path(), client_timezone)?;
if is_memories_match(file_date, now, span_mode, years_back) {
if is_memories_match(
entry.path().to_str().unwrap_or("Unknown"),
file_date,
now,
span_mode,
years_back,
) {
let path_relative = entry.path().strip_prefix(base).ok()?.to_str()?.to_string();
Some((
@@ -575,6 +581,7 @@ pub async fn list_memories(
}
fn is_memories_match(
file_path: &str,
file_date: NaiveDate,
today: NaiveDate,
span: MemoriesSpan,
@@ -586,8 +593,8 @@ fn is_memories_match(
let years_diff = (today.year() - file_date.year()).unsigned_abs();
if years_diff > years_back {
warn!(
"File date is too far in the past: {:?} vs {:?}",
file_date, today
"File ({}) date is too far in the past: {:?} vs {:?}",
file_path, file_date, today
);
return false;
}