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

include normalized filenames in the rename list

Browse Source 
Since they'll need to be uploaded on the next sync, better not to
hide them from the list
This commit is contained in:
Damien Elmes 2020-02-11 09:50:06 +10:00
parent c347c9aee8
commit 9913dcd5dc
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rslib/src/media/check.rs
View File

@ -121,15 +121,10 @@ where
} }
// rename if required // rename if required
let (norm_name, renamed) = self.normalize_and_maybe_rename(ctx, &disk_fname)?; let (norm_name, renamed_on_disk) = self.normalize_and_maybe_rename(ctx, &disk_fname)?;
if renamed { if renamed_on_disk {
let orig_as_nfc = normalize_to_nfc(&disk_fname);
// if the only difference is the unicode normalization,
// we don't mark the file as a renamed file
if orig_as_nfc.as_ref() != norm_name.as_ref() {
out.renamed out.renamed
.insert(orig_as_nfc.to_string(), norm_name.to_string()); .insert(disk_fname.to_string(), norm_name.to_string());
}
} }
out.files.push(norm_name.into_owned()); out.files.push(norm_name.into_owned());