Compare commits

...

4 Commits

Author SHA1 Message Date
73cd4a27ac [release] expose-dir-via-http v1.3.2 2025-02-21 10:31:14 +01:00
6b050f3a05 [deps] cargo update
Updating log       v0.4.25            -> v0.4.26
Updating zstd-safe v7.2.1             -> v7.2.3
Updating zstd-sys  v2.0.13+zstd.1.5.6 -> v2.0.14+zstd.1.5.7
Updating zstd      v0.13.2            -> v0.13.3
2025-02-21 10:31:12 +01:00
8b94b630be [release] expose-dir-via-http v1.3.1 2025-02-20 19:05:12 +01:00
e35b0c9fd9 [code] small improvements suggested by Grok 3
- differentiate between "not a directory" and a real error while reading the path
- don't clone the PathBuf, instead use Arc
2025-02-20 19:04:53 +01:00
3 changed files with 20 additions and 18 deletions

18
Cargo.lock generated
View File

@ -562,7 +562,7 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
[[package]]
name = "expose-dir-via-http"
version = "1.3.0"
version = "1.3.2"
dependencies = [
"actix-files",
"actix-web",
@ -934,9 +934,9 @@ dependencies = [
[[package]]
name = "log"
version = "0.4.25"
version = "0.4.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
[[package]]
name = "memchr"
@ -1664,27 +1664,27 @@ dependencies = [
[[package]]
name = "zstd"
version = "0.13.2"
version = "0.13.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9"
checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
dependencies = [
"zstd-safe",
]
[[package]]
name = "zstd-safe"
version = "7.2.1"
version = "7.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059"
checksum = "f3051792fbdc2e1e143244dc28c60f73d8470e93f3f9cbd0ead44da5ed802722"
dependencies = [
"zstd-sys",
]
[[package]]
name = "zstd-sys"
version = "2.0.13+zstd.1.5.6"
version = "2.0.14+zstd.1.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
checksum = "8fb060d4926e4ac3a3ad15d864e99ceb5f343c6b34f5bd6d81ae6ed417311be5"
dependencies = [
"cc",
"pkg-config",

View File

@ -1,6 +1,6 @@
[package]
name = "expose-dir-via-http"
version = "1.3.0"
version = "1.3.2"
edition = "2024"
[lints.rust]

View File

@ -2,11 +2,12 @@ use std::{
net::{IpAddr, SocketAddr},
num::NonZeroUsize,
path::PathBuf,
sync::Arc,
thread::available_parallelism,
};
use actix_web::{App, HttpServer};
use clap::{crate_name, crate_version, Parser};
use clap::{Parser, crate_name, crate_version};
#[derive(Parser, Debug)]
#[clap(name = crate_name!(), version = crate_version!())]
@ -25,11 +26,11 @@ struct Args {
}
fn parse_valid_dir(dir: &str) -> Result<PathBuf, String> {
let path = std::path::Path::new(dir);
if path.is_dir() {
Ok(path.to_path_buf())
} else {
Err(format!("{} is not a valid directory", path.display()))
let path = PathBuf::from(dir);
match std::fs::metadata(&path) {
Ok(metadata) if metadata.is_dir() => Ok(path),
Ok(_) => Err(format!("{} is not a directory", path.display())),
Err(e) => Err(format!("Error accessing {}: {}", path.display(), e)),
}
}
@ -37,7 +38,7 @@ fn parse_valid_dir(dir: &str) -> Result<PathBuf, String> {
async fn main() -> std::io::Result<()> {
let args = Args::parse();
let dir = args.dir;
let dir = Arc::new(args.dir);
let sock = SocketAddr::new(args.ip, args.port);
println!(
@ -46,8 +47,9 @@ async fn main() -> std::io::Result<()> {
);
HttpServer::new(move || {
let dir = dir.clone();
App::new().service(
actix_files::Files::new("/", dir.clone())
actix_files::Files::new("/", dir.as_ref())
.show_files_listing()
.prefer_utf8(true),
)