From e18175272e97f84f9fb0f53254ed766662f34fb1 Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Fri, 17 Jan 2020 18:00:26 +0000 Subject: [PATCH] Loeschen von Bilddateien beruecksichtigt auch die verborgenen kleineren Fassungen im selben Ordner. --- src/java/de/uhilger/filecms/api/FileMgr.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 46 insertions(+), 3 deletions(-) diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java index 32c3a54..197b913 100644 --- a/src/java/de/uhilger/filecms/api/FileMgr.java +++ b/src/java/de/uhilger/filecms/api/FileMgr.java @@ -21,8 +21,15 @@ import de.uhilger.filecms.data.FileRef; import de.uhilger.filecms.pub.AbstractComparator; import de.uhilger.filecms.pub.FileNameComparator; +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; @@ -34,6 +41,8 @@ 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; @@ -44,8 +53,10 @@ 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; +import org.apache.commons.io.filefilter.WildcardFileFilter; /** * Methoden zur Verwaltung von Dateien @@ -117,7 +128,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 { @@ -143,7 +154,15 @@ } 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(".")) { @@ -228,7 +247,17 @@ if(targetFile.isDirectory()) { FileUtils.deleteDirectory(targetFile); } else { - targetFile.delete(); + /* + Wenn targetFile mit jpg, jpeg oder png endet, + muss eine Unterfunktion eine Liste aller Dateien bilden, + die so heissen, also z.B. alle [Dateiname]*.jpg + */ + String fname = targetFile.getName().toLowerCase(); + if(fname.endsWith(TNServlet.JPEG) || fname.endsWith(TNServlet.JPG) || fname.endsWith(TNServlet.PNG)) { + deleteImgFiles(targetDir, targetFile); + } else { + targetFile.delete(); + } } } } @@ -240,6 +269,20 @@ return result; } + public void deleteImgFiles(File targetDir, File targetFile) { + String fnameext = targetFile.getName(); + int dotpos = fnameext.lastIndexOf("."); + String fname = fnameext.substring(0, dotpos); + String ext = fnameext.substring(dotpos); + logger.fine("fname: " + fname + ", ext: " + ext); + FileFilter fileFilter = new WildcardFileFilter(fname + "*" + ext); + File[] files = targetDir.listFiles(fileFilter); + for (int i = 0; i < files.length; i++) { + logger.fine(files[i].getName()); + files[i].delete(); + } + } + public String copyFiles(String fromPath, String toPath, List fileNames) { return copyOrMoveFiles(fromPath, toPath, fileNames, OP_COPY); } -- Gitblit v1.9.3