From 8ebe1becf124cf6143e3410d10cfb0fb760911e6 Mon Sep 17 00:00:00 2001 From: int 80h Date: Sat, 23 May 2020 16:45:51 -0400 Subject: [PATCH] Bug fix: removed unwrap in mime guess --- Cargo.toml | 2 +- src/main.rs | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6442271..cd0a814 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "gemserv" -version = "0.3.0" +version = "0.3.1" authors = ["int 80h "] edition = "2018" diff --git a/src/main.rs b/src/main.rs index 9ba04a9..9e1367e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,7 +2,6 @@ extern crate serde_derive; use futures_util::future::TryFutureExt; -use mime; use mime_guess; use openssl::ssl::NameType; use std::env; @@ -27,9 +26,7 @@ mod revproxy; mod tls; fn get_mime(path: &PathBuf) -> String { - let mut mime = "text/gemini"; - let m: mime::Mime; - + let mut mime = "text/gemini".to_string(); let ext = match path.extension() { Some(p) => p.to_str().unwrap(), None => return mime.to_string(), @@ -39,9 +36,11 @@ fn get_mime(path: &PathBuf) -> String { "gemini" => mime, "gmi" => mime, _ => { - m = mime_guess::from_ext(ext).first().unwrap(); - m.essence_str() - } + match mime_guess::from_ext(ext).first() { + Some(m) => m.essence_str().to_string(), + None => mime, + } + }, }; return mime.to_string();