langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't try to read file data when file marked as a deletion

Browse Source 
If the user hadn't used the media check to clean up files with
invalid names on disk,  the long filename would break the 'automatically
rename long filenames when syncing' functionality, causing the original
long filename to be uploaded to AnkiWeb as an addition instead of
a deletion
This commit is contained in:
Damien Elmes 2020-03-10 09:29:36 +10:00
parent 78dd812f94
commit 18cd841246
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rslib/src/media/sync.rs
View File

@ -712,13 +712,18 @@ fn zip_files<'a>(
break; break;
} }
let file_data = match data_for_file(media_folder, &file.fname) { let file_data = if file.sha1.is_some() {
Ok(data) => data, match data_for_file(media_folder, &file.fname) {
Err(e) => { Ok(data) => data,
debug!(log, "error accessing {}: {}", &file.fname, e); Err(e) => {
invalid_entries.push(&file.fname); debug!(log, "error accessing {}: {}", &file.fname, e);
continue; invalid_entries.push(&file.fname);
continue;
}
} }
} else {
// uploading deletion
None
}; };
if let Some(data) = &file_data { if let Some(data) = &file_data {