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

Strip isolation chars from filenames in Check Media screen

Browse Source
This commit is contained in:
abdo 2021-09-27 22:03:20 +03:00
parent 2a2469e7a2
commit 018594c5fb
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rslib/i18n/src/lib.rs
View File

@ -422,6 +422,10 @@ pub struct ResourcesForJavascript {
resources: Vec<String>, resources: Vec<String>,
} }
pub fn without_unicode_isolation(s: &str) -> String {
s.replace("\u{2068}", "").replace("\u{2069}", "")
}
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use unic_langid::langid; use unic_langid::langid;

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

@ -25,6 +25,8 @@ use crate::{
text::{extract_media_refs, normalize_to_nfc, MediaRef, REMOTE_FILENAME}, text::{extract_media_refs, normalize_to_nfc, MediaRef, REMOTE_FILENAME},
}; };
use anki_i18n::without_unicode_isolation;
#[derive(Debug, PartialEq, Clone)] #[derive(Debug, PartialEq, Clone)]
pub struct MediaCheckOutput { pub struct MediaCheckOutput {
pub unused: Vec<String>, pub unused: Vec<String>,
@ -125,7 +127,9 @@ where
buf += &i.media_check_renamed_header(); buf += &i.media_check_renamed_header();
buf.push('\n'); buf.push('\n');
for (old, new) in &output.renamed { for (old, new) in &output.renamed {
buf += &i.media_check_renamed_file(old.as_str(), new.as_str()); buf += &without_unicode_isolation(
&i.media_check_renamed_file(old.as_str(), new.as_str()),
);
buf.push('\n'); buf.push('\n');
} }
buf.push('\n') buf.push('\n')
@ -136,7 +140,7 @@ where
buf += &i.media_check_oversize_header(); buf += &i.media_check_oversize_header();
buf.push('\n'); buf.push('\n');
for fname in &output.oversize { for fname in &output.oversize {
buf += &i.media_check_oversize_file(fname.as_str()); buf += &without_unicode_isolation(&i.media_check_oversize_file(fname.as_str()));
buf.push('\n'); buf.push('\n');
} }
buf.push('\n') buf.push('\n')
@ -147,7 +151,7 @@ where
buf += &i.media_check_subfolder_header(); buf += &i.media_check_subfolder_header();
buf.push('\n'); buf.push('\n');
for fname in &output.dirs { for fname in &output.dirs {
buf += &i.media_check_subfolder_file(fname.as_str()); buf += &without_unicode_isolation(&i.media_check_subfolder_file(fname.as_str()));
buf.push('\n'); buf.push('\n');
} }
buf.push('\n') buf.push('\n')
@ -158,7 +162,7 @@ where
buf += &i.media_check_missing_header(); buf += &i.media_check_missing_header();
buf.push('\n'); buf.push('\n');
for fname in &output.missing { for fname in &output.missing {
buf += &i.media_check_missing_file(fname.as_str()); buf += &without_unicode_isolation(&i.media_check_missing_file(fname.as_str()));
buf.push('\n'); buf.push('\n');
} }
buf.push('\n') buf.push('\n')
@ -169,7 +173,7 @@ where
buf += &i.media_check_unused_header(); buf += &i.media_check_unused_header();
buf.push('\n'); buf.push('\n');
for fname in &output.unused { for fname in &output.unused {
buf += &i.media_check_unused_file(fname.as_str()); buf += &without_unicode_isolation(&i.media_check_unused_file(fname.as_str()));
buf.push('\n'); buf.push('\n');
} }
} }