Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-02 04:46:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1667 from deltachat/revert-1664-sanitize-filename-reader-friendly

Browse Source 
Revert "Switch to sanitize-filename-reader-friendly"
This commit is contained in:
bjoern
2020-06-23 18:40:40 +02:00
committed by GitHub
parent 93797bc82f aeb8a2e260
commit ccf8eeacd6
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Cargo.lock generated
View File

@@ -869,7 +869,7 @@ dependencies = [
"regex", "regex",
"rusqlite", "rusqlite",
"rustyline", "rustyline",
"sanitize-filename-reader-friendly", "sanitize-filename",
"serde", "serde",
"serde_json", "serde_json",
"sha2 0.9.0", "sha2 0.9.0",
@@ -2687,10 +2687,14 @@ dependencies = [
] ]
[[package]] [[package]]
name = "sanitize-filename-reader-friendly" name = "sanitize-filename"
version = "0.9.2" version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "464ea3b205846bf746a75a3483d82027b05d157b0415788b7cea7cf0c4d36892" checksum = "23fd0fec94ec480abfd86bb8f4f6c57e0efb36dac5c852add176ea7b04c74801"
dependencies = [
"lazy_static",
"regex",
]
[[package]] [[package]]
name = "schannel" name = "schannel"

2
Cargo.toml
View File

@@ -48,7 +48,7 @@ image-meta = "0.1.0"
quick-xml = "0.18.1" quick-xml = "0.18.1"
escaper = "0.1.0" escaper = "0.1.0"
bitflags = "1.1.0" bitflags = "1.1.0"
sanitize-filename-reader-friendly = "0.9.2" sanitize-filename = "0.2.1"
stop-token = { version = "0.1.1", features = ["unstable"] } stop-token = { version = "0.1.1", features = ["unstable"] }
mailparse = "0.12.1" mailparse = "0.12.1"
encoded-words = { git = "https://github.com/async-email/encoded-words", branch="master" } encoded-words = { git = "https://github.com/async-email/encoded-words", branch="master" }

7
src/blob.rs
View File

@@ -320,8 +320,13 @@ impl<'a> BlobObject<'a> {
break; break;
} }
} }
let opts = sanitize_filename::Options {
truncate: true,
windows: true,
replacement: "",
};
let clean = sanitize_filename_reader_friendly::sanitize(&name); let clean = sanitize_filename::sanitize_with_options(name, opts);
let mut iter = clean.splitn(2, '.'); let mut iter = clean.splitn(2, '.');
let stem: String = iter.next().unwrap_or_default().chars().take(64).collect(); let stem: String = iter.next().unwrap_or_default().chars().take(64).collect();
let ext: String = iter.next().unwrap_or_default().chars().take(32).collect(); let ext: String = iter.next().unwrap_or_default().chars().take(32).collect();