From b12c95e1d53caed954314ed5e42f0e54730df5cd Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Tue, 03 Apr 2018 07:40:16 +0000 Subject: [PATCH] Dateiablage als JNDI-Parameter eingebaut --- src/java/de/uhilger/filecms/api/FileMgr.java | 410 +++++++++++++++++++++++++++++++++------------------------- 1 files changed, 232 insertions(+), 178 deletions(-) diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java index 7995ba0..2b8b985 100644 --- a/src/java/de/uhilger/filecms/api/FileMgr.java +++ b/src/java/de/uhilger/filecms/api/FileMgr.java @@ -18,14 +18,10 @@ 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.wbx.Bild; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -44,6 +40,7 @@ import java.util.logging.Logger; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; +import net.coobird.thumbnailator.Thumbnails; import org.apache.commons.io.FileUtils; /** @@ -93,131 +90,146 @@ private List<FileRef> listInt(String relPath, String orderBy, String order) { Bild bild = new Bild(); List<FileRef> files = new ArrayList(); - if(relPath.length() == 0) { - FileRef namedPublicFolder = new FileRef(PUB_DIR_NAME, true); - logger.finer(namedPublicFolder.getAbsolutePath()); - FileRef namedHomeFolder = new FileRef(HOME_DIR_NAME, true); - logger.finer(namedHomeFolder.getAbsolutePath()); - FileRef namedDavFolder = new FileRef(DAV_DIR_NAME, true); - logger.finer(namedDavFolder.getAbsolutePath()); - files = new ArrayList(); - files.add(namedHomeFolder); - files.add(namedPublicFolder); - files.add(namedDavFolder); - if(getRequest().isUserInRole(WBX_ADMIN_ROLE)) { - FileRef namedBaseFolder = new FileRef(WBX_BASE, true); - FileRef namedDataFolder = new FileRef(WBX_DATA, true); - files.add(namedBaseFolder); - files.add(namedDataFolder); - } - } else { - String path = getTargetDir(relPath).getAbsolutePath(); - logger.fine("listing path: " + path); - File dir = new File(path); - if(dir.exists()) { - File[] fileArray = dir.listFiles(); - if(orderBy != null && orderBy.equalsIgnoreCase("name")) { - Arrays.sort(fileArray, new FileNameComparator(order)); - } else { - Arrays.sort(fileArray, new FileNameComparator(AbstractComparator.ORDER_ASC)); + 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()); + FileRef namedHomeFolder = new FileRef(HOME_DIR_NAME, true); + logger.finer(namedHomeFolder.getAbsolutePath()); + FileRef namedDavFolder = new FileRef(DAV_DIR_NAME, true); + logger.finer(namedDavFolder.getAbsolutePath()); + files = new ArrayList(); + files.add(namedHomeFolder); + files.add(namedPublicFolder); + files.add(namedDavFolder); + if (getRequest().isUserInRole(WBX_ADMIN_ROLE)) { + FileRef namedBaseFolder = new FileRef(WBX_BASE, true); + FileRef namedDataFolder = new FileRef(WBX_DATA, true); + files.add(namedBaseFolder); + files.add(namedDataFolder); } - for(int i = 0; i < fileArray.length; i++) { - logger.fine(fileArray[i].toURI().toString()); - String fname = fileArray[i].toURI().toString().replace("file:/", ""); - if(fileArray[i].isDirectory()) { - fname = fname.substring(0, fname.length() - 1); + } else { + String path = getTargetDir(relPath).getAbsolutePath(); + logger.fine("listing path: " + path); + File dir = new File(path); + if (dir.exists()) { + File[] fileArray = dir.listFiles(); + if (orderBy != null && orderBy.equalsIgnoreCase("name")) { + Arrays.sort(fileArray, new FileNameComparator(order)); + } else { + Arrays.sort(fileArray, new FileNameComparator(AbstractComparator.ORDER_ASC)); } - logger.fine(fname); - FileRef ref = new FileRef(fname, fileArray[i].isDirectory()); - ref.setMimetype(bild.getMimeType(fileArray[i])); - files.add(ref); + for (int i = 0; i < fileArray.length; i++) { + logger.fine(fileArray[i].toURI().toString()); + String fname = fileArray[i].toURI().toString().replace("file:/", ""); + if (fileArray[i].isDirectory()) { + fname = fname.substring(0, fname.length() - 1); + } + logger.fine(fname); + 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 FileRef newFolder(String relPath, String folderName) { - logger.finer(relPath); - String targetPath = null; - if(relPath.startsWith(PUB_DIR_NAME)) { - targetPath = PUB_DIR_PATH + getUserName() + "/" + relPath.substring(PUB_DIR_NAME.length()) + "/" + folderName; - } else if(relPath.startsWith(HOME_DIR_NAME)) { - targetPath = HOME_DIR_PATH + getUserName() + "/" + relPath.substring(HOME_DIR_NAME.length()) + "/" + folderName; + if (!relPath.startsWith(".")) { + logger.finer(relPath); + String targetPath = null; + if(relPath.startsWith(PUB_DIR_NAME)) { + targetPath = PUB_DIR_PATH + getUserName() + "/" + relPath.substring(PUB_DIR_NAME.length()) + "/" + folderName; + } else if(relPath.startsWith(HOME_DIR_NAME)) { + targetPath = HOME_DIR_PATH + getUserName() + "/" + relPath.substring(HOME_DIR_NAME.length()) + "/" + folderName; + } else { + // kann eigentlich nicht sein.. + } + logger.finer(targetPath); + File targetDir = new File(getBase().getAbsolutePath(), targetPath); + targetDir.mkdirs(); + return new FileRef(targetDir.getAbsolutePath(), true); } else { - // kann eigentlich nicht sein.. + return null; } - logger.finer(targetPath); - File targetDir = new File(getBase().getAbsolutePath(), targetPath); - targetDir.mkdirs(); - return new FileRef(targetDir.getAbsolutePath(), true); } public String getCode(String relPath, String fileName) { String code = null; - - Object p = getRequest().getUserPrincipal(); - if(p instanceof Principal) { - Reader reader = null; - try { - File targetFile = new File(getTargetDir(relPath), fileName); - - //reader = new InputStreamReader(new FileInputStream(targetFile), "UTF8"); - - reader = new FileReader(targetFile); - StringBuffer buf = new StringBuffer(); - char[] readBuffer = new char[1024]; - int charsRead = reader.read(readBuffer); - while(charsRead > -1) { - buf.append(readBuffer, 0, charsRead); - charsRead = reader.read(readBuffer); - } - code = buf.toString(); - } catch (FileNotFoundException ex) { - Logger.getLogger(FileMgr.class.getName()).log(Level.SEVERE, null, ex); - } catch (IOException ex) { - Logger.getLogger(FileMgr.class.getName()).log(Level.SEVERE, null, ex); - } finally { + if (!relPath.startsWith(".")) { + Object p = getRequest().getUserPrincipal(); + if (p instanceof Principal) { + Reader reader = null; try { - reader.close(); + File targetFile = new File(getTargetDir(relPath), fileName); + + //reader = new InputStreamReader(new FileInputStream(targetFile), "UTF8"); + reader = new FileReader(targetFile); + StringBuffer buf = new StringBuffer(); + char[] readBuffer = new char[1024]; + int charsRead = reader.read(readBuffer); + while (charsRead > -1) { + buf.append(readBuffer, 0, charsRead); + charsRead = reader.read(readBuffer); + } + code = buf.toString(); + } catch (FileNotFoundException ex) { + Logger.getLogger(FileMgr.class.getName()).log(Level.SEVERE, null, ex); } catch (IOException ex) { Logger.getLogger(FileMgr.class.getName()).log(Level.SEVERE, null, ex); + } finally { + try { + reader.close(); + } catch (IOException ex) { + Logger.getLogger(FileMgr.class.getName()).log(Level.SEVERE, null, ex); + } } + } - - } - + } return code; } public String renameFile(String relPath, String fname, String newName) { - File targetDir = getTargetDir(relPath); - File file = new File(targetDir, fname); - file.renameTo(new File(targetDir, newName)); - return fname + " umbenannt zu " + newName; + if (!relPath.startsWith(".")) { + File targetDir = getTargetDir(relPath); + File file = new File(targetDir, fname); + file.renameTo(new File(targetDir, newName)); + return fname + " umbenannt zu " + newName; + } else { + return "Pfad nicht erlaubt."; + } } public String deleteFiles(String relPath, List fileNames) { String result = null; try { logger.fine(fileNames.toString()); - File targetDir = getTargetDir(relPath); - for(int i=0; i < fileNames.size(); i++) { - Object o = fileNames.get(i); - if(o instanceof ArrayList) { - ArrayList al = (ArrayList) o; - logger.fine(al.get(0).toString()); - File targetFile = new File(targetDir, al.get(0).toString()); - logger.fine(targetFile.getAbsolutePath()); - if(targetFile.isDirectory()) { - FileUtils.deleteDirectory(targetFile); - } else { - targetFile.delete(); + if (!relPath.startsWith(".")) { + File targetDir = getTargetDir(relPath); + for(int i=0; i < fileNames.size(); i++) { + Object o = fileNames.get(i); + if(o instanceof ArrayList) { + ArrayList al = (ArrayList) o; + logger.fine(al.get(0).toString()); + File targetFile = new File(targetDir, al.get(0).toString()); + logger.fine(targetFile.getAbsolutePath()); + if(targetFile.isDirectory()) { + FileUtils.deleteDirectory(targetFile); + } else { + targetFile.delete(); + } } } + result = "deleted"; } - result = "deleted"; } catch (Throwable ex) { logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); } @@ -235,25 +247,27 @@ private String copyOrMoveFiles(String fromPath, String toPath, List fileNames, int operation) { String result = null; try { - File srcDir = getTargetDir(fromPath); - File targetDir = getTargetDir(toPath); - Iterator i = fileNames.iterator(); - while(i.hasNext()) { - Object o = i.next(); - if (o instanceof ArrayList) { - ArrayList al = (ArrayList) o; - File srcFile = new File(srcDir, al.get(0).toString()); - if(srcFile.isDirectory()) { - if(operation == OP_MOVE) { - FileUtils.moveDirectoryToDirectory(srcFile, targetDir, false); + if (!fromPath.startsWith(".")) { + File srcDir = getTargetDir(fromPath); + File targetDir = getTargetDir(toPath); + Iterator i = fileNames.iterator(); + while(i.hasNext()) { + Object o = i.next(); + if (o instanceof ArrayList) { + ArrayList al = (ArrayList) o; + File srcFile = new File(srcDir, al.get(0).toString()); + if(srcFile.isDirectory()) { + if(operation == OP_MOVE) { + FileUtils.moveDirectoryToDirectory(srcFile, targetDir, false); + } else { + FileUtils.copyDirectoryToDirectory(srcFile, targetDir); + } } else { - FileUtils.copyDirectoryToDirectory(srcFile, targetDir); - } - } else { - if(operation == OP_MOVE) { - FileUtils.moveFileToDirectory(srcFile, targetDir, false); - } else { - FileUtils.copyFileToDirectory(srcFile, targetDir); + if(operation == OP_MOVE) { + FileUtils.moveFileToDirectory(srcFile, targetDir, false); + } else { + FileUtils.copyFileToDirectory(srcFile, targetDir); + } } } } @@ -267,16 +281,18 @@ public FileRef saveTextFileAs(String relPath, String fileName, String contents) { FileRef savedFile = null; logger.fine(relPath + " " + fileName); - //FileRef datenRef = getBase(); - Object p = getRequest().getUserPrincipal(); - if(p instanceof Principal) { - File targetFile = new File(getTargetDir(relPath), fileName); - if(targetFile.exists()) { - targetFile = getNewFileName(targetFile); - } else { - targetFile.getParentFile().mkdirs(); + if (!relPath.startsWith(".")) { + //FileRef datenRef = getBase(); + Object p = getRequest().getUserPrincipal(); + if(p instanceof Principal) { + File targetFile = new File(getTargetDir(relPath), fileName); + if(targetFile.exists()) { + targetFile = getNewFileName(targetFile); + } else { + targetFile.getParentFile().mkdirs(); + } + saveToFile(targetFile, contents); } - saveToFile(targetFile, contents); } return savedFile; } @@ -332,34 +348,36 @@ public FileRef saveTextFile(String relPath, String fileName, String contents) { FileRef savedFile = null; logger.fine(relPath + " " + fileName); - //FileRef datenRef = getBase(); - Object p = getRequest().getUserPrincipal(); - if(p instanceof Principal) { - File targetFile = new File(getTargetDir(relPath), fileName); - if(targetFile.exists()) { - /* - muss delete() sein? - pruefen: ueberschreibt der FileWriter den alteen Inhalt oder - entsteht eine unerwuenschte Mischung aus altem und neuem - Inhalt? - */ - targetFile.delete(); - } else { - targetFile.getParentFile().mkdirs(); + if (!relPath.startsWith(".")) { + //FileRef datenRef = getBase(); + Object p = getRequest().getUserPrincipal(); + if(p instanceof Principal) { + File targetFile = new File(getTargetDir(relPath), fileName); + if(targetFile.exists()) { + /* + muss delete() sein? + pruefen: ueberschreibt der FileWriter den alteen Inhalt oder + entsteht eine unerwuenschte Mischung aus altem und neuem + Inhalt? + */ + targetFile.delete(); + } else { + targetFile.getParentFile().mkdirs(); + } + saveToFile(targetFile, contents); } - saveToFile(targetFile, contents); } return savedFile; } public String bildVerkleinern(String relPath, String bildName) { - File dir = getTargetDir(relPath); - File original = new File(dir, bildName); - Bild bild = new Bild(); - //for (int i = 0; i < Bild.GR.length; i++) { - + if (!relPath.startsWith(".")) { + File dir = getTargetDir(relPath); + File original = new File(dir, bildName); + Bild bild = new Bild(); + //for (int i = 0; i < Bild.GR.length; i++) { + //int gr = bild.getVariantenGroesse(i); - String ext = ""; String nurname = bildName; int dotpos = bildName.indexOf("."); @@ -367,47 +385,83 @@ ext = bildName.substring(dotpos); 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); - 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)); - } - } + // 120, 240, 500, 700, 1200 + + + 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) { + } + 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"; + + return "ok"; + } else { + return "Pfad micht erlaubt."; + } } - public String extractZipfile(String relPath, String filename) { - String result; - try { - File targetDir = getTargetDir(relPath); - File archive = new File(targetDir, filename); - if(extract(archive)) { - result = "ok"; - } else { - result = "error while extracting"; + String result = null; + if (!relPath.startsWith(".")) { + try { + File targetDir = getTargetDir(relPath); + File archive = new File(targetDir, filename); + if(extract(archive)) { + result = "ok"; + } else { + result = "error while extracting"; + } + } catch(Exception ex) { + result = ex.getLocalizedMessage(); + logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); } - } catch(Exception ex) { - result = ex.getLocalizedMessage(); - logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); } return result; } -- Gitblit v1.9.3