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/web/TNServlet.java |   80 +++++++++++++++++++++++++++++++++-------
 1 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/src/de/uhilger/wbx/web/TNServlet.java b/src/de/uhilger/wbx/web/TNServlet.java
index 2d4e744..e86adb4 100644
--- a/src/de/uhilger/wbx/web/TNServlet.java
+++ b/src/de/uhilger/wbx/web/TNServlet.java
@@ -17,10 +17,16 @@
  */
 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.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -32,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 {
   
@@ -42,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";
@@ -59,23 +71,63 @@
           throws ServletException, IOException {
     
     String uriStr = request.getRequestURI();
-    File imgfile = new File(uriStr);
+    String relname = uriStr.substring(request.getContextPath().length());
     
-    logger.fine("realpath of /: " + request.getServletContext().getRealPath("/"));
-    
-    logger.fine("imgfile: " + imgfile.getAbsolutePath());
-    
-    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
-      */      
-      //writeImageStream(Image image, int gr, String mimeType, response.getOutputStream());
+    // --- 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());
+    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(logimgfile.getAbsolutePath());
+    logger.fine(buf.toString());
+    // --- Logausgabe Ende
+        
+    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