X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftemplate%2FImageLinkFilter.java;h=9ede85143caf60f0c99700e5fbe62e278fc8d0e2;hp=9e758cfd525312fd64178f2351e589acc620a825;hb=0e8f7804ce344bdd69f5ecc7febe25a60a53561d;hpb=18ce272a6e9b0af7fa7f1874a70b9ef7ff11e592

diff --git a/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java b/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
index 9e758cf..9ede851 100644
--- a/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
+++ b/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
@@ -1,5 +1,5 @@
 /*
- * Sone - ImageLinkFilter.java - Copyright © 2011 David Roden
+ * Sone - ImageLinkFilter.java - Copyright © 2011–2013 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,19 +17,24 @@
 
 package net.pterodactylus.sone.template;
 
+import static java.lang.Integer.MAX_VALUE;
+import static java.lang.String.valueOf;
+import static net.pterodactylus.sone.utils.NumberParsers.parseInt;
+
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.Map;
 
+import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.data.Image;
-import net.pterodactylus.util.number.Numbers;
-import net.pterodactylus.util.object.Default;
 import net.pterodactylus.util.template.Filter;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 import net.pterodactylus.util.template.TemplateContextFactory;
 import net.pterodactylus.util.template.TemplateParser;
 
+import com.google.common.base.Optional;
+
 /**
  * Template filter that turns an {@link Image} into an HTML <img> tag,
  * using some parameters to influence parameters of the image.
@@ -39,7 +44,10 @@ import net.pterodactylus.util.template.TemplateParser;
 public class ImageLinkFilter implements Filter {
 
 	/** The template to render for the <img> tag. */
-	private static final Template linkTemplate = TemplateParser.parse(new StringReader("<img<%ifnull !class> class=\"<%class|css>\"<%/if> src=\"<%src|html>\" alt=\"<%alt|html>\" title=\"<%title|html>\" width=\"<%width|html>\" height=\"<%height|html>\" style=\"position: relative;<%ifnull ! top>top: <% top|html>;<%/if><%ifnull ! left>left: <% left|html>;<%/if>\"/>"));
+	private static final Template linkTemplate = TemplateParser.parse(new StringReader("<img<%ifnull !class> class=\"<%class|css>\"<%/if> src=\"<%src|html><%if forceDownload>?forcedownload=true<%/if>\" alt=\"<%alt|html>\" title=\"<%title|html>\" width=\"<%width|html>\" height=\"<%height|html>\" style=\"position: relative;<%ifnull ! top>top: <% top|html>;<%/if><%ifnull ! left>left: <% left|html>;<%/if>\"/>"));
+
+	/** The core. */
+	private final Core core;
 
 	/** The template context factory. */
 	private final TemplateContextFactory templateContextFactory;
@@ -47,10 +55,13 @@ public class ImageLinkFilter implements Filter {
 	/**
 	 * Creates a new image link filter.
 	 *
+	 * @param core
+	 *            The core
 	 * @param templateContextFactory
 	 *            The template context factory
 	 */
-	public ImageLinkFilter(TemplateContextFactory templateContextFactory) {
+	public ImageLinkFilter(Core core, TemplateContextFactory templateContextFactory) {
+		this.core = core;
 		this.templateContextFactory = templateContextFactory;
 	}
 
@@ -58,21 +69,27 @@ public class ImageLinkFilter implements Filter {
 	 * {@inheritDoc}
 	 */
 	@Override
-	public Object format(TemplateContext templateContext, Object data, Map<String, String> parameters) {
-		Image image = (Image) data;
-		String imageClass = parameters.get("class");
-		int maxWidth = Numbers.safeParseInteger(parameters.get("max-width"), Integer.MAX_VALUE);
-		int maxHeight = Numbers.safeParseInteger(parameters.get("max-height"), Integer.MAX_VALUE);
-		String mode = String.valueOf(parameters.get("mode"));
-		String title = parameters.get("title");
-		if ((title != null) && title.startsWith("=")) {
-			title = String.valueOf(templateContext.get(title.substring(1)));
+	public Object format(TemplateContext templateContext, Object data, Map<String, Object> parameters) {
+		Image image = null;
+		if (data instanceof String) {
+			image = core.getImage((String) data, false);
+		} else if (data instanceof Image) {
+			image = (Image) data;
 		}
+		if (image == null) {
+			return null;
+		}
+		String imageClass = valueOf(parameters.get("class"));
+		int maxWidth = parseInt(valueOf(parameters.get("max-width")), MAX_VALUE);
+		int maxHeight = parseInt(valueOf(parameters.get("max-height")), MAX_VALUE);
+		String mode = valueOf(parameters.get("mode"));
+		String title = valueOf(parameters.get("title"));
 
 		TemplateContext linkTemplateContext = templateContextFactory.createTemplateContext();
 		linkTemplateContext.set("class", imageClass);
 		if (image.isInserted()) {
 			linkTemplateContext.set("src", "/" + image.getKey());
+			linkTemplateContext.set("forceDownload", true);
 		} else {
 			linkTemplateContext.set("src", "getImage.html?image=" + image.getId());
 		}
@@ -82,13 +99,8 @@ public class ImageLinkFilter implements Filter {
 			double scale = Math.max(maxWidth / (double) imageWidth, maxHeight / (double) imageHeight);
 			linkTemplateContext.set("width", (int) (imageWidth * scale + 0.5));
 			linkTemplateContext.set("height", (int) (imageHeight * scale + 0.5));
-			if (scale >= 1) {
-				linkTemplateContext.set("left", String.format("%dpx", (int) ((imageWidth * scale) - maxWidth) / 2));
-				linkTemplateContext.set("top", String.format("%dpx", (int) ((imageHeight * scale) - maxHeight) / 2));
-			} else {
-				linkTemplateContext.set("left", String.format("%dpx", (int) (maxWidth - (imageWidth * scale)) / 2));
-				linkTemplateContext.set("top", String.format("%dpx", (int) (maxHeight - (imageHeight * scale)) / 2));
-			}
+			linkTemplateContext.set("left", String.format("%dpx", (int) (maxWidth - (imageWidth * scale)) / 2));
+			linkTemplateContext.set("top", String.format("%dpx", (int) (maxHeight - (imageHeight * scale)) / 2));
 		} else {
 			double scale = 1;
 			if ((imageWidth > maxWidth) || (imageHeight > maxHeight)) {
@@ -97,8 +109,8 @@ public class ImageLinkFilter implements Filter {
 			linkTemplateContext.set("width", (int) (imageWidth * scale + 0.5));
 			linkTemplateContext.set("height", (int) (imageHeight * scale + 0.5));
 		}
-		linkTemplateContext.set("alt", Default.forNull(title, image.getDescription()));
-		linkTemplateContext.set("title", Default.forNull(title, image.getTitle()));
+		linkTemplateContext.set("alt", Optional.fromNullable(title).or(image.getDescription()));
+		linkTemplateContext.set("title", Optional.fromNullable(title).or(image.getTitle()));
 
 		StringWriter stringWriter = new StringWriter();
 		linkTemplate.render(linkTemplateContext, stringWriter);