From f2a70357272c7a2e61f724385e23b4c4fa2e69cb Mon Sep 17 00:00:00 2001 From: ulrich Date: Thu, 23 Jul 2020 13:09:13 +0000 Subject: [PATCH] In Arbeit: PDF Theme --- src/de/uhilger/wbx/web/TNServlet.java | 98 +++++++++++++++++++++++++++++------------------- 1 files changed, 59 insertions(+), 39 deletions(-) diff --git a/src/de/uhilger/wbx/web/TNServlet.java b/src/de/uhilger/wbx/web/TNServlet.java index 0991c2c..9e58fa2 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 { @@ -45,7 +44,12 @@ * Diese String-Konstanten noetigenfalls in eine * Konfigurationsdatei auslagern */ - public static final String TN = "_tn"; + public static final String TN = "_tn"; // 120 + public static final String KL = "_kl"; // 240 + public static final String SM = "_sm"; // 500 + public static final String MT = "_mt"; // 700 + public static final String GR = "_gr"; // 1200 + public static final String JPG = ".jpg"; public static final String JPEG = ".jpeg"; public static final String PNG = ".png"; @@ -65,12 +69,12 @@ String uriStr = request.getRequestURI(); String relname = uriStr.substring(request.getContextPath().length()); + // --- Logausgabe Start /* - File urifile = new File(uriStr); - uriStr = uriStr.substring(request.getContextPath().length()); - File dir = new File(request.getServletContext().getRealPath("/")); - File imgfile = new File(dir, uriStr); - + File logurifile = new File(uriStr); + String loguriStr = uriStr.substring(request.getContextPath().length()); + File logdir = new File(request.getServletContext().getRealPath("/")); + File imgfile = new File(logdir, loguriStr); StringBuffer buf = new StringBuffer(); buf.append("contextPath: "); buf.append(request.getContextPath()); @@ -79,40 +83,56 @@ 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()); logger.fine(buf.toString()); + //System.out.println("TNServlet uri parts " + 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 - */ + // --- Logausgabe Ende + + if(uriStr.endsWith(JPG) || uriStr.endsWith(JPEG) || uriStr.endsWith(PNG)) { 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); - } - - } else { - super.doGet(request, response); + String suburiStr = uriStr.substring(request.getContextPath().length()); + File imgfile = new File(dir, suburiStr); + if(uriStr.contains(TN)) { + bildErzeugen(dir, relname, TN, 120, imgfile); + } else if(uriStr.contains(KL)) { + bildErzeugen(dir, relname, KL, 240, imgfile); + } else if(uriStr.contains(SM)) { + bildErzeugen(dir, relname, SM, 500, imgfile); + } else if(uriStr.contains(MT)) { + bildErzeugen(dir, relname, MT, 700, imgfile); + } else if(uriStr.contains(GR)) { + bildErzeugen(dir, relname, GR, 1200, imgfile); + } } - - + super.doGet(request, response); } + private void bildErzeugen(File dir, String relname, String indicator, int gr, File tnfile) + throws UnsupportedEncodingException, IOException { + //File dir = new File(request.getServletContext().getRealPath("/")); + // System.out.println("TNServlet dir: " + dir); + relname = relname.replace(indicator, ""); + // System.out.println("TNServlet bildAusgeben relname: " + relname); + // relname: /test/img/IMG_0524.png + 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());*/ + if(imgfile.exists() && !tnfile.exists()) { + Thumbnails.of(imgfile) + .size(gr, gr) + .keepAspectRatio(true) + .outputQuality(0.7) + .toFile(tnfile); + } + } } -- Gitblit v1.9.3