1 files changed, 64 insertions, 13 deletions

diff --git a/src/filters/files.rs b/src/filters/files.rs
index 733d045..59de2f3 100644
--- a/src/filters/files.rs
+++ b/src/filters/files.rs
@@ -1,7 +1,7 @@
 use crate::{config::FileserverConfig, ServiceError};
 use bytes::{Bytes, BytesMut};
 use futures_util::{future, future::Either, ready, stream, FutureExt, Stream, StreamExt};
-use headers::{AcceptRanges, ContentLength, ContentRange, ContentType, HeaderMapExt};
+use headers::{AcceptRanges, ContentLength, ContentRange, ContentType, HeaderMapExt, LastModified};
 use http_body_util::{combinators::BoxBody, BodyExt, StreamBody};
 use humansize::FormatSizeOptions;
 use hyper::{
@@ -78,30 +78,73 @@ pub async fn serve_files(
         }
     }
 
+    let modified = metadata.modified()?;
+
+    let not_modified = if config.last_modified {
+        req.headers()
+            .typed_get::<headers::IfModifiedSince>()
+            .map(|if_modified_since| {
+                Ok::<_, ServiceError>(!if_modified_since.is_modified(modified))
+            })
+            .transpose()?
+            .unwrap_or_default()
+    } else {
+        false
+    };
+
+    // let etag = ETag::from_str(&calc_etag(modified)).map_err(|_| ServiceError::Other)?;
+    // let etag_matches = if config.etag {
+    //     req.headers()
+    //         .typed_get::<headers::IfNoneMatch>()
+    //         .map(|if_none_match| if_none_match.precondition_passes(&etag))
+    //         .unwrap_or_default()
+    // } else {
+    //     false
+    // };
+
     let range = req.headers().typed_get::<headers::Range>();
     let range = bytes_range(range, metadata.len())?;
 
     debug!("sending file {path:?}");
     let file = File::open(path.clone()).await?;
 
-    let mut r = Response::new(BoxBody::new(StreamBody::new(
-        StreamBody::new(file_stream(file, 4096, range.clone()))
-            .map(|e| e.map(|e| Frame::data(e)).map_err(ServiceError::Io)),
-    )));
+    // let skip_body = not_modified || etag_matches;
+    let skip_body = not_modified;
+    let mut r = if skip_body {
+        Response::new("".to_string()).map(|b| b.map_err(|e| match e {}).boxed())
+    } else {
+        Response::new(BoxBody::new(StreamBody::new(
+            StreamBody::new(file_stream(file, 4096, range.clone()))
+                .map(|e| e.map(|e| Frame::data(e)).map_err(ServiceError::Io)),
+        )))
+    };
 
-    if range.end - range.start != metadata.len() {
-        *r.status_mut() = StatusCode::PARTIAL_CONTENT;
-        r.headers_mut().typed_insert(
-            ContentRange::bytes(range.clone(), metadata.len()).expect("valid ContentRange"),
-        );
+    if !skip_body {
+        if range.end - range.start != metadata.len() {
+            *r.status_mut() = StatusCode::PARTIAL_CONTENT;
+            r.headers_mut().typed_insert(
+                ContentRange::bytes(range.clone(), metadata.len()).expect("valid ContentRange"),
+            );
+        }
+    }
+    // if not_modified || etag_matches {
+    if not_modified {
+        *r.status_mut() = StatusCode::NOT_MODIFIED;
     }
 
-    let mime = mime_guess::from_path(path).first_or_octet_stream();
-
+    r.headers_mut().typed_insert(AcceptRanges::bytes());
     r.headers_mut()
         .typed_insert(ContentLength(range.end - range.start));
+
+    let mime = mime_guess::from_path(path).first_or_octet_stream();
     r.headers_mut().typed_insert(ContentType::from(mime));
-    r.headers_mut().typed_insert(AcceptRanges::bytes());
+
+    // if config.etag {
+    //     r.headers_mut().typed_insert(etag);
+    // }
+    if config.last_modified {
+        r.headers_mut().typed_insert(LastModified::from(modified));
+    }
 
     Ok(r)
 }
@@ -276,3 +319,11 @@ markup::define! {
         }
     }
 }
+
+// fn calc_etag(s: SystemTime) -> String {
+//     // TODO: make this not change after server restart but still unguessable
+//     let mut hasher = DefaultHasher::new();
+//     s.hash(&mut hasher);
+//     let hash = hasher.finish();
+//     hex::encode(hash.to_le_bytes())
+// }