From e73500ef7c14f02b40b68bac8a3ce04a56e32386 Mon Sep 17 00:00:00 2001 From: Nick Rolfe Date: Fri, 30 Oct 2020 14:38:24 +0000 Subject: [PATCH] Cope with empty filenames/extensions --- extractor/src/extractor.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/extractor/src/extractor.rs b/extractor/src/extractor.rs index cb7caeeda68..83e0ecf43c9 100644 --- a/extractor/src/extractor.rs +++ b/extractor/src/extractor.rs @@ -51,8 +51,14 @@ impl Extractor { vec![ Arg::Label(file_label), Arg::String(normalize_path(path)), - Arg::String(format!("{}", path.file_name().unwrap().to_string_lossy())), - Arg::String(format!("{}", path.extension().unwrap().to_string_lossy())), + Arg::String(match path.file_name() { + None => "".to_owned(), + Some(file_name) => format!("{}", file_name.to_string_lossy()), + }), + Arg::String(match path.extension() { + None => "".to_owned(), + Some(ext) => format!("{}", ext.to_string_lossy()), + }), Arg::Int(1), // 1 = from source ], ),