;
-
-pub fn stream_tar_in_thread(path: P) -> Stream
-where
- P: AsRef + Send + 'static,
-{
- let (writer, stream) = StreamWriter::new(64);
-
- thread::spawn(move || {
- let mut a = tar::Builder::new(writer);
- let last_path_component = path.as_ref().file_name().unwrap();
- a.mode(tar::HeaderMode::Deterministic);
- a.append_dir_all(last_path_component, &path)
- .unwrap_or_else(|e| println!("{}", e));
- a.finish().unwrap_or_else(|e| println!("{}", e));
- });
- stream
-}
-
-struct StreamWriter {
- tx: Sender,
-}
-
-impl StreamWriter {
- fn new(size: usize) -> (Self, Stream) {
- let (tx, rx) = futures::channel::mpsc::channel(size);
- (StreamWriter { tx }, rx)
- }
-}
-
-impl io::Write for StreamWriter {
- fn write(&mut self, data: &[u8]) -> io::Result {
- let len = data.len();
- futures::executor::block_on(async move {
- let buf = bytes::Bytes::copy_from_slice(data);
- self.tx.send(buf).await.ok(); // maybe propagate any errors back
- });
- Ok(len)
- }
-
- fn flush(&mut self) -> io::Result<()> {
- futures::executor::block_on(async move { self.tx.flush().await.ok() });
- Ok(())
- }
-}
diff --git a/src/web.rs b/src/web.rs
index 593cbab..92c5fd6 100644
--- a/src/web.rs
+++ b/src/web.rs
@@ -1,8 +1,8 @@
-use actix_files::{Files, NamedFile};
+use actix_files::Files;
use actix_web::{
- get, middleware, web, App, Error, HttpRequest, HttpResponse, HttpServer, Responder,
+ dev::{fn_service, ServiceRequest, ServiceResponse},
+ get, middleware, App, HttpResponse, HttpServer, Responder,
};
-use futures::StreamExt;
use std::path::PathBuf;
@@ -10,15 +10,41 @@ pub async fn run(bind_addr: &str, root: &PathBuf) -> std::io::Result<()> {
let root_ = root.clone();
let s = HttpServer::new(move || {
let static_files = Files::new("/", &root_)
+ .prefer_utf8(true)
+ .index_file("index.html")
+ .use_hidden_files()
.show_files_listing()
.redirect_to_slash_directory()
- .files_listing_renderer(crate::directory_listing::directory_listing);
+ .files_listing_renderer(crate::directory_listing::directory_listing)
+ .default_handler(fn_service(|req: ServiceRequest| async {
+ let (req, _) = req.into_parts();
+ let style = include_str!("style.css");
+
+ let html = format!(
+ "\n\
+ \n\
+ \n\
+ Error\n\
+ \n\
+ \n\
+ Error
\
+ File not found
\
+ \n",
+ style
+ );
+
+ Ok(ServiceResponse::new(
+ req,
+ HttpResponse::NotFound()
+ .content_type("text/html; charset=utf-8")
+ .body(html),
+ ))
+ }));
App::new()
.app_data(root_.clone())
.wrap(middleware::Logger::default())
.service(favicon_ico)
- .service(handle_tar)
.service(static_files)
})
.bind(bind_addr)?
@@ -28,37 +54,6 @@ pub async fn run(bind_addr: &str, root: &PathBuf) -> std::io::Result<()> {
s.await
}
-#[get("/{tail:.*}.tar")]
-async fn handle_tar(
- req: HttpRequest,
- root: web::Data,
- tail: web::Path,
-) -> impl Responder {
- let relpath = PathBuf::from(tail.trim_end_matches('/'));
- let fullpath = root.join(&relpath).canonicalize().unwrap();
-
- // if a .tar already exists, just return it as-is
- let mut fullpath_tar = fullpath.clone();
- fullpath_tar.set_extension("tar");
- if fullpath_tar.is_file() {
- return NamedFile::open_async(fullpath_tar)
- .await
- .unwrap()
- .into_response(&req);
- }
-
- if !(fullpath.is_dir()) {
- return HttpResponse::NotFound().body("Directory not found\n");
- }
-
- let stream = crate::threaded_archiver::stream_tar_in_thread(fullpath).map(Ok::<_, Error>);
- let response = HttpResponse::Ok()
- .content_type("application/x-tar")
- .streaming(stream);
-
- response
-}
-
const FAVICON_ICO: &[u8] = include_bytes!("favicon.png");
#[get("/favicon.ico")]