ti-nuage/gemserv
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Bug fix: removed unwrap in mime guess

Browse Source
This commit is contained in:
int 80h
2020-05-23 16:45:51 -04:00
parent fadd8fd8b9
commit 8ebe1becf1
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "gemserv" name = "gemserv"
version = "0.3.0" version = "0.3.1"
authors = ["int 80h <int@80h.dev>"] authors = ["int 80h <int@80h.dev>"]
edition = "2018" edition = "2018"

13
src/main.rs
View File

@@ -2,7 +2,6 @@
extern crate serde_derive; extern crate serde_derive;
use futures_util::future::TryFutureExt; use futures_util::future::TryFutureExt;
use mime;
use mime_guess; use mime_guess;
use openssl::ssl::NameType; use openssl::ssl::NameType;
use std::env; use std::env;
@@ -27,9 +26,7 @@ mod revproxy;
mod tls; mod tls;
fn get_mime(path: &PathBuf) -> String { fn get_mime(path: &PathBuf) -> String {
let mut mime = "text/gemini"; let mut mime = "text/gemini".to_string();
let m: mime::Mime;
let ext = match path.extension() { let ext = match path.extension() {
Some(p) => p.to_str().unwrap(), Some(p) => p.to_str().unwrap(),
None => return mime.to_string(), None => return mime.to_string(),
@@ -39,9 +36,11 @@ fn get_mime(path: &PathBuf) -> String {
"gemini" => mime, "gemini" => mime,
"gmi" => mime, "gmi" => mime,
_ => { _ => {
m = mime_guess::from_ext(ext).first().unwrap(); match mime_guess::from_ext(ext).first() {
m.essence_str() Some(m) => m.essence_str().to_string(),
} None => mime,
}
},
}; };
return mime.to_string(); return mime.to_string();