Added download option to mmid lookup

Cargo.toml

@@ -16,6 +16,8 @@ rocket = { version = "0.5", features = ["json"] }
 serde = { version = "1.0.213", features = ["derive"] }
 serde_with = { version = "3.11.0", features = ["chrono_0_4"] }
 toml = "0.8.19"
+unidecode = "0.3.0"
+urlencoding = "2.1.3"
 uuid = { version = "1.11.0", features = ["serde", "v4"] }
 
 [profile.production]

src/endpoints.rs

@@ -4,7 +4,7 @@ use std::{
 };
 
 use rocket::{
-    get, http::ContentType, response::{self, Redirect, Responder, Response}, serde::{self, json::Json}, tokio::fs::File, uri, Request, State
+    get, http::{uri::Uri, ContentType, Header}, response::{self, Redirect, Responder, Response}, serde::{self, json::Json}, tokio::{self, fs::File}, uri, Request, State
 };
 use serde::Serialize;
 
@@ -60,12 +60,13 @@ pub async fn lookup_mmid(db: &State<Arc<RwLock<Mochibase>>>, mmid: &str) -> Opti
     ))))
 }
 
-#[get("/f/<mmid>?noredir")]
+#[get("/f/<mmid>?noredir&<download>")]
 pub async fn lookup_mmid_noredir(
     db: &State<Arc<RwLock<Mochibase>>>,
     settings: &State<Settings>,
     mmid: &str,
-) -> Option<(ContentType, File)> {
+    download: bool,
+) -> Option<FileDownloader> {
     let mmid: Mmid = mmid.try_into().ok()?;
     let entry = db.read().unwrap().get(&mmid).cloned()?;
 
@@ -73,12 +74,43 @@ pub async fn lookup_mmid_noredir(
         .await
         .ok()?;
 
-    Some((
+    Some(FileDownloader {
-        ContentType::from_str(entry.mime_type()).unwrap_or(ContentType::Binary),
+        inner: file,
-        file,
+        filename: entry.name().clone(),
-    ))
+        content_type: ContentType::from_str(entry.mime_type()).unwrap_or(ContentType::Binary),
+        disposition: download
+    })
 }
 
+pub struct FileDownloader {
+    inner: tokio::fs::File,
+    filename: String,
+    content_type: ContentType,
+    disposition: bool,
+}
+
+impl<'r> Responder<'r, 'r> for FileDownloader {
+    fn respond_to(self, _: &'r Request<'_>) -> response::Result<'r> {
+        let mut resp = Response::build();
+        resp.streamed_body(self.inner)
+            .header(self.content_type);
+
+        if self.disposition {
+            resp.raw_header(
+                "Content-Disposition",
+                format!(
+                    "attachment; filename=\"{}\"; filename*=UTF-8''{}",
+                    unidecode::unidecode(&self.filename),
+                    urlencoding::encode(&self.filename)
+                )
+            );
+        }
+
+        resp.ok()
+    }
+}
+
+
 #[get("/f/<mmid>/<name>")]
 pub async fn lookup_mmid_name(
     db: &State<Arc<RwLock<Mochibase>>>,

src/lib.rs

@@ -20,10 +20,9 @@ use chrono::{TimeDelta, Utc};
 use database::{Chunkbase, ChunkedInfo, Mmid, MochiFile, Mochibase};
 use maud::{html, Markup, PreEscaped};
 use rocket::{
-    data::ToByteUnit, get, post, serde::{json::Json, Serialize}, tokio::{
+    data::ToByteUnit, get, http::ContentType, post, serde::{json::Json, Serialize}, tokio::{
-        fs,
+        self, fs, io::{AsyncSeekExt, AsyncWriteExt}
-        io::{AsyncSeekExt, AsyncWriteExt},
+    }, Data, Responder, State
-    }, Data, State
 };
 use uuid::Uuid;
 

src/pages.rs

@@ -131,6 +131,8 @@ pub fn api_info(settings: &State<Settings>) -> Markup {
                     behavior can be modified by appending " code{"?noredir"} " to
                     the end of this request, like " code{"/f/<mmid>?noredir"} ",
                     in which case it behaves just like " code{"/f/<mmid>/<filename>"}
+                    ". Appending " code{"download"} " forces the browser to download
+                    the file regardless of MIME type."
                 }
                 p {"Example default response:"}
                 pre {"303: /f/xNLF6ogx/1600-1200.jpg"}