From bfc821456a1164af45d79875c2793c02042efdd8 Mon Sep 17 00:00:00 2001 From: Nathan Jaremko Date: Sat, 2 Mar 2019 20:47:52 -0500 Subject: Improve extension handling --- src/utils.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/utils.rs') diff --git a/src/utils.rs b/src/utils.rs index e00df98..bb96909 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -13,8 +13,11 @@ const UNSUBSCRIBE_NOTE: &str = "Note: this does NOT delete any downloaded podcas pub fn trim_extension(filename: &str) -> Option { let name = String::from(filename); - let index = name.rfind('.')?; - Some(String::from(&name[0..index])) + if name.contains(".") { + name.rfind('.').map(|index| String::from(&name[0..index])) + } else { + Some(name) + } } pub fn find_extension(input: &str) -> Option { @@ -166,6 +169,6 @@ mod tests { #[test] fn test_trim_extension_invalid() { - assert_eq!(trim_extension("test"), None) + assert_eq!(trim_extension("test"), Some("test".into())) } } -- cgit v1.2.3