From 91d228bb4af8fde188de7fd2d893ef063a4366e5 Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Mon, 10 Jul 2017 06:50:05 +0000 Subject: [PATCH] TNServlet um zusaetzliche Bildgroessen erweitert --- src/de/uhilger/wbx/Bild.java | 9 ++-- src/de/uhilger/wbx/web/TNServlet.java | 57 ++++++++++++++++++++-------- 2 files changed, 45 insertions(+), 21 deletions(-) diff --git a/src/de/uhilger/wbx/Bild.java b/src/de/uhilger/wbx/Bild.java index d53b8ad..ab796e9 100644 --- a/src/de/uhilger/wbx/Bild.java +++ b/src/de/uhilger/wbx/Bild.java @@ -39,11 +39,12 @@ public static final int WINZIG = 0; public static final int KLEIN = 1; - public static final int MITTEL = 2; - public static final int GROSS = 3; + public static final int SEMI = 2; + public static final int MITTEL = 3; + public static final int GROSS = 4; - public static final String[] GRNAME = {"-w", "-k", "-m", "-g"}; - public static final int[] GR = {120, 240, 700, 1200}; + public static final String[] GRNAME = {"-w", "-k", "-s", "-m", "-g"}; + public static final int[] GR = {120, 240, 500, 700, 1200}; public void writeImageStream(Image image, int gr, String mimeType, OutputStream out) throws InterruptedException, IOException { ImageIO.write(getReducedImage(image, gr, mimeType), imgType(mimeType), out); diff --git a/src/de/uhilger/wbx/web/TNServlet.java b/src/de/uhilger/wbx/web/TNServlet.java index e681146..e86adb4 100644 --- a/src/de/uhilger/wbx/web/TNServlet.java +++ b/src/de/uhilger/wbx/web/TNServlet.java @@ -24,6 +24,7 @@ import java.awt.Toolkit; import java.io.File; import java.io.IOException; +import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.util.logging.Level; import java.util.logging.Logger; @@ -37,6 +38,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 { @@ -47,6 +50,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"; @@ -86,25 +93,41 @@ logger.fine(buf.toString()); // --- Logausgabe Ende - if(uriStr.contains(TN) && (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, URLDecoder.decode(relname, "utf-8")); - 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); - } + if(uriStr.endsWith(JPG) || uriStr.endsWith(JPEG) || uriStr.endsWith(PNG)) { + if(uriStr.contains(TN)) { + bildAusgeben(request, response, relname, TN, Bild.WINZIG); + } else if(uriStr.contains(KL)) { + bildAusgeben(request, response, relname, KL, Bild.KLEIN); + } else if(uriStr.contains(SM)) { + bildAusgeben(request, response, relname, SM, Bild.SEMI); + } else if(uriStr.contains(MT)) { + bildAusgeben(request, response, relname, MT, Bild.MITTEL); + } else if(uriStr.contains(GR)) { + bildAusgeben(request, response, relname, GR, Bild.GROSS); + } else { + super.doGet(request, response); + } } else { super.doGet(request, response); } } + + private void bildAusgeben(HttpServletRequest request, HttpServletResponse response, String relname, String indicator, int bildTyp) throws UnsupportedEncodingException, IOException { + File dir = new File(request.getServletContext().getRealPath("/")); + relname = relname.replace(indicator, ""); + File imgfile = new File(dir, URLDecoder.decode(relname, "utf-8")); + 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(bildTyp), bild.getMimeType(imgfile), response.getOutputStream()); + } + } catch (InterruptedException ex) { + logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); + } + } } -- Gitblit v1.9.3