More convenient serving of static files.

rapidoid · Dec 13, 2015 · 6eb1546 · 6eb1546
1 parent 1cf06b0
commit 6eb1546
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 11 deletions.
diff --git a/rapidoid-ctx/src/main/java/org/rapidoid/http/Response.java b/rapidoid-ctx/src/main/java/org/rapidoid/http/Response.java
@@ -20,6 +20,7 @@
  * #L%
  */
 
+import java.io.File;
 import java.util.Map;
 
 import org.rapidoid.commons.MediaType;
@@ -46,6 +47,14 @@ public interface Response {
 
 	String redirect();
 
+	Response filename(String filename);
+
+	String filename();
+
+	Response file(File file);
+
+	File file();
+
 	Response view(String view);
 
 	String view();

diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/http/fast/HttpResponse.java b/rapidoid-http-fast/src/main/java/org/rapidoid/http/fast/HttpResponse.java
@@ -20,6 +20,7 @@
  * #L%
  */
 
+import java.io.File;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -37,19 +38,23 @@ public class HttpResponse implements Response {
 
 	private final ReqImpl req;
 
-	private Object content = null;
+	private volatile Object content = null;
 
-	private int code = 200;
+	private volatile int code = 200;
 
-	private MediaType contentType = MediaType.HTML_UTF_8;
+	private volatile MediaType contentType = MediaType.HTML_UTF_8;
 
 	private final Map<String, String> headers = Collections.synchronizedMap(new HashMap<String, String>());
 
 	private final Map<String, String> cookies = Collections.synchronizedMap(new HashMap<String, String>());
 
-	private String redirect = null;
+	private volatile String redirect = null;
 
-	private String view = null;
+	private volatile String filename = null;
+
+	private volatile File file = null;
+
+	private volatile String view = null;
 
 	public HttpResponse(ReqImpl req) {
 		this.req = req;
@@ -113,6 +118,30 @@ public synchronized String redirect() {
 		return this.redirect;
 	}
 
+	@Override
+	public synchronized Response filename(String filename) {
+		ensureCanChange();
+		this.filename = filename;
+		return this;
+	}
+
+	@Override
+	public synchronized String filename() {
+		return this.filename;
+	}
+
+	@Override
+	public synchronized Response file(File file) {
+		ensureCanChange();
+		this.file = file;
+		return this;
+	}
+
+	@Override
+	public synchronized File file() {
+		return this.file;
+	}
+
 	private void ensureCanChange() {
 		U.must(!req.isDone(), "The request was already processed, so the response can't be changed now!");
 		U.must(!req.isRendering(), "The response rendering has already started, so the response can't be changed now!");

diff --git a/rapidoid-http-fast/src/main/java/org/rapidoid/http/fast/HttpUtils.java b/rapidoid-http-fast/src/main/java/org/rapidoid/http/fast/HttpUtils.java
@@ -144,18 +144,18 @@ public static String renderState(Map<String, Serializable> pageLocals) {
 		}
 	}
 
-	public static void setContentTypeForFile(Req req, File file) {
+	public static void setContentTypeForFile(Response resp, File file) {
 		U.must(file.exists());
-		setContentType(req, MediaType.getByFileName(file.getAbsolutePath()));
+		setContentType(resp, MediaType.getByFileName(file.getAbsolutePath()));
 	}
 
-	public static void setContentTypeForResource(Req req, Res resource) {
+	public static void setContentTypeForResource(Response resp, Res resource) {
 		U.must(resource.exists());
-		setContentType(req, MediaType.getByFileName(resource.getShortName()));
+		setContentType(resp, MediaType.getByFileName(resource.getShortName()));
 	}
 
-	public static void setContentType(Req req, MediaType mediaType) {
+	public static void setContentType(Response resp, MediaType mediaType) {
-		req.response().contentType(mediaType);
+		resp.contentType(mediaType);
 	}
 
 	public static void setCookie(Req req, String name, String value, String... extras) {
@@ -209,6 +209,31 @@ public static String getErrorMessage(Throwable err) {
 
 	public static void postProcessResponse(Response resp) {
 		postProcessRedirect(resp);
+		postProcessFile(resp);
+		postProcessFilename(resp);
+	}
+
+	private static void postProcessFile(Response resp) {
+		File file = resp.file();
+		if (file != null) {
+			U.must(file.exists());
+
+			if (resp.filename() == null) {
+				resp.filename();
+			}
+
+			setContentTypeForFile(resp, file);
+
+			resp.content(Res.from(file.getAbsolutePath()).getBytes());
+		}
+	}
+
+	private static void postProcessFilename(Response resp) {
+		String filename = resp.filename();
+		if (filename != null) {
+			resp.headers().put(HttpHeaders.CONTENT_DISPOSITION.name(), "attachment; filename=\"" + filename + "\"");
+			resp.headers().put(HttpHeaders.CACHE_CONTROL.name(), "private");
+		}
 	}
 
 	private static void postProcessRedirect(Response resp) {