use cache name for etag

1 files changed, 7 insertions, 2 deletions

diff --git a/server/src/routes/ui/mod.rs b/server/src/routes/ui/mod.rs
index 3a006a9..ea78ea5 100644
--- a/server/src/routes/ui/mod.rs
+++ b/server/src/routes/ui/mod.rs
@@ -17,6 +17,7 @@ use std::{
     hash::{Hash, Hasher},
     io::Cursor,
     os::unix::prelude::MetadataExt,
+    path::Path,
     pin::Pin,
 };
 use tokio::{fs::File, io::AsyncRead};
@@ -66,9 +67,13 @@ impl AsyncRead for Defer {
 
 pub struct CacheControlFile(File, String);
 impl CacheControlFile {
-    pub async fn new(f: File) -> Self {
+    pub async fn new_cachekey(p: &Path) -> anyhow::Result<Self> {
+        let tag = p.file_name().unwrap().to_str().unwrap().to_owned();
+        let f = File::open(p).await?;
+        Ok(Self(f, tag))
+    }
+    pub async fn new_mtime(f: File) -> Self {
         let meta = f.metadata().await.unwrap();
-        // TODO ETag should be cache path (or something like that) so federation clients can dedup assets
         let modified = meta.mtime();
         let mut h = DefaultHasher::new();
         modified.hash(&mut h);