edward/omegaupload
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: edward:73b7b50ed416bedc18660455018058539a26415f
Branches Tags
edward:master
edward:webpack
..
compare: edward:247a5ad6f69fcbd168d79c6cadaeb34be194bbd6
Branches Tags
edward:master
edward:webpack

No commits in common. "73b7b50ed416bedc18660455018058539a26415f" and "247a5ad6f69fcbd168d79c6cadaeb34be194bbd6" have entirely different histories.
73b7b50ed4 ... 247a5ad6f6

2 changed files with 6 additions and 11 deletions
Show stats Expand all files Collapse all files

3
test/text.pgp
View file

@ -1,3 +0,0 @@
-----BEGIN PGP MESSAGE-----
-----END PGP MESSAGE-----

14
web/src/decrypt.rs
View file

@ -141,18 +141,17 @@ impl<T: AsRef<[u8]>> ContentTypeExt for T {
fn content_type(&self) -> ContentType {
let mime_type = self.mime_type();
// check image first; tree magic match_u8 matches SVGs as plain text
if mime_type.starts_with("image/")
// application/x-riff is WebP
|| mime_type == "application/x-riff"
{
ContentType::Image
} else if tree_magic_mini::match_u8("text/plain", self.as_ref()) {
if mime_type.starts_with("text/") || mime_type == "application/mbox" {
if std::str::from_utf8(self.as_ref()).is_ok() {
ContentType::Text
} else {
ContentType::Unknown
}
} else if mime_type.starts_with("image/")
// application/x-riff is WebP
|| mime_type == "application/x-riff"
{
ContentType::Image
} else if mime_type.starts_with("audio/") {
ContentType::Audio
} else if mime_type.starts_with("video/")
@ -198,5 +197,4 @@ mod content_type {
test_content_type!(zip_is_zip, "archive.zip", ContentType::ZipArchive);
test_content_type!(gzip_is_gzip, "image.png.gz", ContentType::GzipArchive);
test_content_type!(binary_is_unknown, "omegaupload", ContentType::Unknown);
test_content_type!(pgp_is_text, "text.pgp", ContentType::Text);
}