From 38929aa1f4f4a017be4d2e93c32165b9e51f635d Mon Sep 17 00:00:00 2001
From: ulrich
Date: Tue, 21 Jul 2020 13:21:17 +0000
Subject: [PATCH] In Arbeit: PDF Theme
---
src/de/uhilger/wbx/web/TNServlet.java | 77 ++++++++++++++++++++------------------
1 files changed, 41 insertions(+), 36 deletions(-)
diff --git a/src/de/uhilger/wbx/web/TNServlet.java b/src/de/uhilger/wbx/web/TNServlet.java
index e86adb4..9e58fa2 100644
--- a/src/de/uhilger/wbx/web/TNServlet.java
+++ b/src/de/uhilger/wbx/web/TNServlet.java
@@ -17,20 +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.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;
import javax.servlet.http.HttpServletResponse;
+import net.coobird.thumbnailator.Thumbnails;
import org.apache.catalina.servlets.DefaultServlet;
/**
@@ -49,11 +44,12 @@
* Diese String-Konstanten noetigenfalls in eine
* 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 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";
@@ -74,10 +70,11 @@
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 logimgfile = new File(logdir, loguriStr);
+ File imgfile = new File(logdir, loguriStr);
StringBuffer buf = new StringBuffer();
buf.append("contextPath: ");
buf.append(request.getContextPath());
@@ -89,45 +86,53 @@
buf.append(logurifile.getAbsolutePath());
buf.append("\n");
buf.append("imgfile: ");
- buf.append(logimgfile.getAbsolutePath());
+ 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)) {
- bildAusgeben(request, response, relname, TN, Bild.WINZIG);
+ bildErzeugen(dir, relname, TN, 120, imgfile);
} else if(uriStr.contains(KL)) {
- bildAusgeben(request, response, relname, KL, Bild.KLEIN);
+ bildErzeugen(dir, relname, KL, 240, imgfile);
} else if(uriStr.contains(SM)) {
- bildAusgeben(request, response, relname, SM, Bild.SEMI);
+ bildErzeugen(dir, relname, SM, 500, imgfile);
} else if(uriStr.contains(MT)) {
- bildAusgeben(request, response, relname, MT, Bild.MITTEL);
+ bildErzeugen(dir, relname, MT, 700, imgfile);
} else if(uriStr.contains(GR)) {
- bildAusgeben(request, response, relname, GR, Bild.GROSS);
- } else {
- super.doGet(request, response);
+ bildErzeugen(dir, relname, GR, 1200, imgfile);
}
- } else {
- super.doGet(request, response);
}
+ 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("/"));
+ 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"));
- Image image = Toolkit.getDefaultToolkit().getImage(imgfile.getAbsolutePath());
- MediaTracker mediaTracker = new MediaTracker(new Container());
- mediaTracker.addImage(image, 0);
- try {
- mediaTracker.waitForID(0);
+
+ // 120, 240, 500, 700, 1200
- 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);
+ /*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