From 5ebac825d99fb9b6bed2edeeb4c15ba34e8b6350 Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Tue, 03 Apr 2018 07:34:27 +0000 Subject: [PATCH] Lesen von JNDI-Parametern hinzugefuegt --- src/de/uhilger/wbx/web/TNServlet.java | 85 ++++++++++++++++++++++-------------------- 1 files changed, 45 insertions(+), 40 deletions(-) diff --git a/src/de/uhilger/wbx/web/TNServlet.java b/src/de/uhilger/wbx/web/TNServlet.java index 0991c2c..98fd667 100644 --- a/src/de/uhilger/wbx/web/TNServlet.java +++ b/src/de/uhilger/wbx/web/TNServlet.java @@ -17,18 +17,15 @@ */ package de.uhilger.wbx.web; -import de.uhilger.wbx.Bild; -import java.awt.Container; -import java.awt.Image; -import java.awt.MediaTracker; -import java.awt.Toolkit; import java.io.File; import java.io.IOException; -import java.util.logging.Level; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; import java.util.logging.Logger; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import net.coobird.thumbnailator.Thumbnails; import org.apache.catalina.servlets.DefaultServlet; /** @@ -36,6 +33,8 @@ * Miniaturansicht erzeugt werden, wie sie im Dateimanager * der WebBox verwendet wird. * + * Unterstuetzt werden die Varianten + * 120 (_tn), 240 (_kl), 500 (_dd), 700 (_mt), 1200 (_gr) */ public class TNServlet extends DefaultServlet { @@ -46,6 +45,10 @@ * Konfigurationsdatei auslagern */ public static final String TN = "_tn"; + public static final String KL = "_kl"; + public static final String SM = "_sm"; + public static final String MT = "_mt"; + public static final String GR = "_gr"; public static final String JPG = ".jpg"; public static final String JPEG = ".jpeg"; public static final String PNG = ".png"; @@ -65,12 +68,11 @@ String uriStr = request.getRequestURI(); String relname = uriStr.substring(request.getContextPath().length()); - /* - File urifile = new File(uriStr); - uriStr = uriStr.substring(request.getContextPath().length()); - File dir = new File(request.getServletContext().getRealPath("/")); - File imgfile = new File(dir, uriStr); - + // --- Logausgabe Start + File logurifile = new File(uriStr); + String loguriStr = uriStr.substring(request.getContextPath().length()); + File logdir = new File(request.getServletContext().getRealPath("/")); + File logimgfile = new File(logdir, loguriStr); StringBuffer buf = new StringBuffer(); buf.append("contextPath: "); buf.append(request.getContextPath()); @@ -79,40 +81,43 @@ buf.append(request.getServletContext().getRealPath("/")); buf.append("\n"); buf.append("urifile: "); - buf.append(urifile.getAbsolutePath()); + buf.append(logurifile.getAbsolutePath()); buf.append("\n"); buf.append("imgfile: "); - buf.append(imgfile.getAbsolutePath()); + buf.append(logimgfile.getAbsolutePath()); logger.fine(buf.toString()); - */ - - if(uriStr.contains(TN) && (uriStr.endsWith(JPG) || uriStr.endsWith(JPEG) || uriStr.endsWith(PNG))) { - /* - TODO: hier mit Hilfe der Klasse Bild eine Miniaturansicht erzeugen - und in die Antwort schreiben - */ - File dir = new File(request.getServletContext().getRealPath("/")); - relname = relname.replace(TN, ""); - File imgfile = new File(dir, relname); - Image image = Toolkit.getDefaultToolkit().getImage(imgfile.getAbsolutePath()); - MediaTracker mediaTracker = new MediaTracker(new Container()); - mediaTracker.addImage(image, 0); - try { - mediaTracker.waitForID(0); - - if (!mediaTracker.isErrorAny()) { - Bild bild = new Bild(); - bild.writeImageStream(image, bild.getVariantenGroesse(Bild.WINZIG), bild.getMimeType(imgfile), response.getOutputStream()); - } - } catch (InterruptedException ex) { - logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); - } - + // --- Logausgabe Ende + + if(uriStr.endsWith(JPG) || uriStr.endsWith(JPEG) || uriStr.endsWith(PNG)) { + if(uriStr.contains(TN)) { + bildAusgeben(request, response, relname, TN, 120); + } else if(uriStr.contains(KL)) { + bildAusgeben(request, response, relname, KL, 240); + } else if(uriStr.contains(SM)) { + bildAusgeben(request, response, relname, SM, 500); + } else if(uriStr.contains(MT)) { + bildAusgeben(request, response, relname, MT, 700); + } else if(uriStr.contains(GR)) { + bildAusgeben(request, response, relname, GR, 1200); + } else { + super.doGet(request, response); + } } else { super.doGet(request, response); } - - } + private void bildAusgeben(HttpServletRequest request, HttpServletResponse response, String relname, String indicator, int gr) throws UnsupportedEncodingException, IOException { + File dir = new File(request.getServletContext().getRealPath("/")); + relname = relname.replace(indicator, ""); + File imgfile = new File(dir, URLDecoder.decode(relname, "utf-8")); + + // 120, 240, 500, 700, 1200 + + Thumbnails.of(imgfile) + .size(gr, gr) + .keepAspectRatio(true) + .outputQuality(0.7) + .toOutputStream(response.getOutputStream()); + } } -- Gitblit v1.9.3