From 332c058bd407c4b6fb30e6bf32b634a72bc68e05 Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Fri, 17 Jan 2020 16:31:42 +0000
Subject: [PATCH] Thumbnails werden nun im jeweiligen Bildordner mit abgelegt und nicht jedesmal 'on the fly' erzeugt.
---
src/java/de/uhilger/filecms/api/FileMgr.java | 206 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 175 insertions(+), 31 deletions(-)
diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java
index 8e63002..d62cbb9 100644
--- a/src/java/de/uhilger/filecms/api/FileMgr.java
+++ b/src/java/de/uhilger/filecms/api/FileMgr.java
@@ -18,15 +18,19 @@
package de.uhilger.filecms.api;
-import de.uhilger.filecms.data.Bild;
import de.uhilger.filecms.data.FileRef;
import de.uhilger.filecms.pub.AbstractComparator;
import de.uhilger.filecms.pub.FileNameComparator;
-import java.awt.Container;
-import java.awt.Image;
-import java.awt.MediaTracker;
-import java.awt.Toolkit;
+import de.uhilger.filecms.pub.ImgFileFilter;
+import de.uhilger.wbx.Bild;
+import de.uhilger.wbx.WbxUtils;
+import static de.uhilger.wbx.WbxUtils.EMPTY_STRING;
+import static de.uhilger.wbx.WbxUtils.WBX_FILE_BASE;
+import de.uhilger.wbx.data.Inhalt;
+import de.uhilger.wbx.web.TNServlet;
import java.io.File;
+import java.io.FileFilter;
+import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FileReader;
@@ -37,13 +41,20 @@
import java.security.Principal;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+import java.util.zip.Adler32;
+import java.util.zip.CheckedOutputStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
+import java.util.zip.ZipOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import net.coobird.thumbnailator.Thumbnails;
import org.apache.commons.io.FileUtils;
/**
@@ -93,7 +104,7 @@
private List<FileRef> listInt(String relPath, String orderBy, String order) {
Bild bild = new Bild();
List<FileRef> files = new ArrayList();
- if (!relPath.startsWith(".")) {
+ if (!relPath.startsWith(".") && !relPath.contains("WEB-INF") && !relPath.contains("META-INF")) {
if (relPath.length() == 0) {
FileRef namedPublicFolder = new FileRef(PUB_DIR_NAME, true);
logger.finer(namedPublicFolder.getAbsolutePath());
@@ -116,7 +127,7 @@
logger.fine("listing path: " + path);
File dir = new File(path);
if (dir.exists()) {
- File[] fileArray = dir.listFiles();
+ File[] fileArray = dir.listFiles(new ImgFileFilter());
if (orderBy != null && orderBy.equalsIgnoreCase("name")) {
Arrays.sort(fileArray, new FileNameComparator(order));
} else {
@@ -129,16 +140,28 @@
fname = fname.substring(0, fname.length() - 1);
}
logger.fine(fname);
- FileRef ref = new FileRef(fname, fileArray[i].isDirectory());
- ref.setMimetype(bild.getMimeType(fileArray[i]));
- files.add(ref);
+ if(!fname.contains("WEB-INF") && !fname.contains("META-INF")) {
+ long fLen = fileArray[i].length();
+ long lastMod = fileArray[i].lastModified();
+ FileRef ref = new FileRef(fname, fileArray[i].isDirectory(), fileArray[i].isHidden(), lastMod, fLen);
+ ref.setMimetype(bild.getMimeType(fileArray[i]));
+ files.add(ref);
+ }
}
}
}
}
return files;
}
-
+
+ public List<Inhalt> collect(String relativePath, int maxTiefe, int maxAnzahl, int len) {
+
+ WbxUtils wu = new WbxUtils();
+ HttpServletRequest req = getRequest();
+ String requestUrl = req.getRequestURL().toString();
+ String contextPath = req.getContextPath();
+ return wu.collectFiles(requestUrl, contextPath, relativePath, maxTiefe, maxAnzahl, len);
+ }
public FileRef newFolder(String relPath, String folderName) {
if (!relPath.startsWith(".")) {
@@ -385,34 +408,69 @@
nurname = bildName.substring(0, dotpos);
}
- Image image = Toolkit.getDefaultToolkit().getImage(original.getAbsolutePath());
- MediaTracker mediaTracker = new MediaTracker(new Container());
- mediaTracker.addImage(image, 0);
- try {
- mediaTracker.waitForID(0);
+ // 120, 240, 500, 700, 1200
- if (!mediaTracker.isErrorAny()) {
- for (int i = 0; i < Bild.GR.length; i++) {
- StringBuffer buf = new StringBuffer();
- buf.append(nurname);
- buf.append(bild.getVariantenName(i));
- buf.append(ext);
- File newImgFile = new File(dir, buf.toString());
- if (!newImgFile.exists()) {
- logger.fine(original.getAbsolutePath() + " " + newImgFile.getAbsolutePath());
- bild.writeImageFile(image, bild.getVariantenGroesse(i), bild.getMimeType(original), newImgFile.getAbsolutePath());
- //bild.writeImageFile(image, photo.getVariantenGroesse(i), photo.getMimetype(), photo.getAbsolutePath(basisPfad), photo.getVariantenName(basisPfad, i));
- }
- }
+
+ for (int i = 0; i < Bild.GR.length; i++) {
+ StringBuffer buf = new StringBuffer();
+ buf.append(nurname);
+ buf.append(bild.getVariantenName(i));
+ buf.append(ext);
+ File newImgFile = new File(dir, buf.toString());
+ try {
+ Thumbnails.of(original)
+ .size(bild.getVariantenGroesse(i), bild.getVariantenGroesse(i))
+ .keepAspectRatio(true)
+ .outputQuality(0.7)
+ .toFile(newImgFile);
+ } catch (IOException ex) {
+ logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
}
- } catch (IOException | InterruptedException ex) {
- logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
}
return "ok";
} else {
return "Pfad micht erlaubt.";
}
}
+
+ public String bildRotieren(String relPath, String bildName) {
+ if (!relPath.startsWith(".")) {
+ File dir = getTargetDir(relPath);
+ File original = new File(dir, bildName);
+
+ String ext = "";
+ String nurname = bildName;
+ int dotpos = bildName.indexOf(".");
+ if (dotpos > -1) {
+ ext = bildName.substring(dotpos);
+ nurname = bildName.substring(0, dotpos);
+ }
+
+ StringBuffer buf = new StringBuffer();
+ buf.append(nurname);
+ buf.append("-rot");
+ buf.append(ext);
+ File newImgFile = new File(dir, buf.toString());
+
+ logger.fine("original: " + original.getAbsolutePath() + " newImgFile: " + newImgFile.getAbsolutePath());
+
+ try {
+ Thumbnails.of(original)
+ .scale(1)
+ .rotate(90)
+ .toFile(newImgFile);
+ } catch (IOException ex) {
+ logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
+ }
+
+
+ return "ok";
+ } else {
+ return "Pfad micht erlaubt.";
+ }
+ }
+
+ /* --------- ZIP entpacken ---------------- */
public String extractZipfile(String relPath, String filename) {
String result = null;
@@ -478,6 +536,92 @@
}
}
+ /* ------------- Ornder als ZIP packen --------------- */
+
+ public String packFolder(String relPath) {
+ if (!relPath.startsWith(".")) {
+ try {
+ File targetDir = getTargetDir(relPath);
+ File parentDir = targetDir.getParentFile();
+ StringBuffer fname = new StringBuffer();
+ fname.append(targetDir.getName());
+ fname.append(".zip");
+ File archiveFile = new File(parentDir, fname.toString());
+ FileRef folderToPack = new FileRef(targetDir.getAbsolutePath());
+ FileRef archive = new FileRef(archiveFile.getAbsolutePath());
+ pack(folderToPack, archive);
+ return "ok";
+ } catch(Exception ex) {
+ String result = ex.getLocalizedMessage();
+ logger.log(Level.SEVERE, result, ex);
+ return result;
+ }
+ } else {
+ return "Falsche relative Pfadangabe";
+ }
+ }
+
+ /**
+ * pack the contents of a given folder into a new ZIP compressed archive
+ * @param folder the folder to pack
+ * @param archive the archive to create from the given files
+ * @throws Exception
+ */
+ private boolean pack(FileRef folder, FileRef archive) throws Exception {
+ File file = new File(archive.getAbsolutePath());
+ FileOutputStream fos = new FileOutputStream(file);
+ CheckedOutputStream checksum = new CheckedOutputStream(fos, new Adler32());
+ ZipOutputStream zos = new ZipOutputStream(checksum);
+ pack(zos, folder.getAbsolutePath(), "");
+ zos.flush();
+ zos.finish();
+ zos.close();
+ fos.flush();
+ fos.close();
+ return true;
+ }
+
+ /**
+ * go through the given file structure recursively
+ * @param zipFile the ZIP file to write to
+ * @param srcDir the directory to pack during this cycle
+ * @param subDir the subdirectory to append to names of file entries inside the archive
+ * @throws IOException
+ */
+ private void pack(ZipOutputStream zipFile, String srcDir, String subDir) throws IOException {
+ File[] files = new File(srcDir).listFiles();
+ for(int i = 0; i < files.length; i++) {
+ if(files[i].isDirectory()) {
+ pack(zipFile, files[i].getAbsolutePath(), subDir + File.separator + files[i].getName());
+ }
+ else {
+ packFile(zipFile, subDir, files[i]);
+ }
+ }
+ }
+
+ /**
+ * pack a given file
+ * @param zipFile the ZIP archive to pack to
+ * @param dir the directory name to append to name of file entry inside archive
+ * @param file the file to pack
+ * @throws IOException
+ */
+ private void packFile(ZipOutputStream zipFile, String dir, File file) throws IOException
+ {
+ FileInputStream fileinputstream = new FileInputStream(file);
+ byte buf[] = new byte[fileinputstream.available()];
+ fileinputstream.read(buf);
+ String dirWithSlashes = dir.replace('\\', '/');
+ //System.out.println("zipping " + dirWithSlashes + "/" + file.getName());
+ ZipEntry ze = new ZipEntry(dirWithSlashes + "/" + file.getName());
+ ze.setMethod(ZipEntry.DEFLATED);
+ zipFile.putNextEntry(ze);
+ zipFile.write(buf, 0, buf.length);
+ zipFile.closeEntry();
+ fileinputstream.close();
+ }
+
/* ---- Hilfsfunktionen ---- */
--
Gitblit v1.9.3