From 122a949ec49f84a49e7a5bec657a93a65faadce1 Mon Sep 17 00:00:00 2001
From: boasting-squirrel <boasting.squirrel@gmail.com>
Date: Tue, 12 Mar 2019 20:16:45 +0100
Subject: Better error messages for invalid path

---
 src/archive.rs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'src/archive.rs')

diff --git a/src/archive.rs b/src/archive.rs
index 556fd69..9df1e5e 100644
--- a/src/archive.rs
+++ b/src/archive.rs
@@ -61,7 +61,21 @@ pub fn create_archive_file(
 /// Compresses a given folder in .tar.gz format
 fn tgz_compress(dir: &PathBuf) -> Result<(String, Bytes), errors::CompressionError> {
     let src_dir = dir.display().to_string();
-    let inner_folder = dir.file_name()?.to_str()?;
+    let inner_folder = match dir.file_name() {
+        Some(directory_name) => match directory_name.to_str() {
+            Some(directory) => directory,
+            None => {
+                return Err(errors::CompressionError::new(
+                    errors::CompressionErrorKind::InvalidUTF8DirectoryName,
+                ))
+            }
+        },
+        None => {
+            return Err(errors::CompressionError::new(
+                errors::CompressionErrorKind::InvalidDirectoryName,
+            ))
+        }
+    };
     let dst_filename = format!("{}.tar", inner_folder);
     let dst_tgz_filename = format!("{}.gz", dst_filename);
 
-- 
cgit v1.2.3