From 1385d2dd22c7bf8189c68a876037779555a22443 Mon Sep 17 00:00:00 2001 From: ulrich <ulrich@ulrich-vaio> Date: Thu, 16 Apr 2020 07:56:12 +0000 Subject: [PATCH] Asciidoctor Servlet eingebaut --- src/de/uhilger/wbx/web/TNServlet.java | 92 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 81 insertions(+), 11 deletions(-) diff --git a/src/de/uhilger/wbx/web/TNServlet.java b/src/de/uhilger/wbx/web/TNServlet.java index 198bced..9e58fa2 100644 --- a/src/de/uhilger/wbx/web/TNServlet.java +++ b/src/de/uhilger/wbx/web/TNServlet.java @@ -17,10 +17,15 @@ */ package de.uhilger.wbx.web; +import java.io.File; import java.io.IOException; +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; /** @@ -28,14 +33,23 @@ * 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 { + + private static final Logger logger = Logger.getLogger(TNServlet.class.getName()); /** * 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"; @@ -52,17 +66,73 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - String urlStr = request.getRequestURI(); - if(urlStr.contains(TN) && (urlStr.endsWith(JPG) || urlStr.endsWith(JPEG) || urlStr.endsWith(PNG))) { - /* - TODO: hier mit Hilfe der Klasse Bild eine Miniaturansicht erzeugen - und in die Antwort schreiben - */ - } else { - super.doGet(request, response); - } - + String uriStr = request.getRequestURI(); + String relname = uriStr.substring(request.getContextPath().length()); + // --- Logausgabe Start + /* + 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()); + buf.append("\n"); + buf.append("realpath of /: "); + buf.append(request.getServletContext().getRealPath("/")); + buf.append("\n"); + buf.append("urifile: "); + 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()); + */ + // --- Logausgabe Ende + + if(uriStr.endsWith(JPG) || uriStr.endsWith(JPEG) || uriStr.endsWith(PNG)) { + File dir = new File(request.getServletContext().getRealPath("/")); + 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