aboutsummaryrefslogtreecommitdiffstats
path: root/src/main.rs
diff options
context:
space:
mode:
authorSven-Hendrik Haase <svenstaro@gmail.com>2019-06-24 03:25:01 +0000
committerGitHub <noreply@github.com>2019-06-24 03:25:01 +0000
commita9f9f23e1017b3cace2301038b9d6e06d8972cba (patch)
tree851b6f2d56433b11d71c2c733b334df2648688ec /src/main.rs
parentUpdate deps (diff)
parentPrecise `tar_dir` behaviour (diff)
downloadminiserve-a9f9f23e1017b3cace2301038b9d6e06d8972cba.tar.gz
miniserve-a9f9f23e1017b3cace2301038b9d6e06d8972cba.zip
Merge pull request #138 from gyscos/master
Enable streaming tarball download
Diffstat (limited to 'src/main.rs')
-rw-r--r--src/main.rs21
1 files changed, 13 insertions, 8 deletions
diff --git a/src/main.rs b/src/main.rs
index f26369a..ddf25e1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -16,6 +16,7 @@ mod auth;
mod errors;
mod file_upload;
mod listing;
+mod pipe;
mod renderer;
mod themes;
@@ -79,17 +80,21 @@ fn run() -> Result<(), ContextualError> {
TermLogger::init(LevelFilter::Error, Config::default())
};
- if miniserve_config.no_symlinks
- && miniserve_config
+ if miniserve_config.no_symlinks {
+ let is_symlink = miniserve_config
.path
.symlink_metadata()
- .map_err(|e| ContextualError::IOError("Failed to retrieve symlink's metadata".to_string(), e))?
+ .map_err(|e| {
+ ContextualError::IOError("Failed to retrieve symlink's metadata".to_string(), e)
+ })?
.file_type()
- .is_symlink()
- {
- return Err(ContextualError::from(
- "The no-symlinks option cannot be used with a symlink path".to_string(),
- ));
+ .is_symlink();
+
+ if is_symlink {
+ return Err(ContextualError::from(
+ "The no-symlinks option cannot be used with a symlink path".to_string(),
+ ));
+ }
}
let inside_config = miniserve_config.clone();