From 11536c42a172f2f63b6c7f2ee2b83667f2fbb5ee Mon Sep 17 00:00:00 2001 From: ulrich <not disclosed> Date: Sun, 19 Mar 2017 09:04:55 +0000 Subject: [PATCH] Pfadeinstellungen fuer TinyMCE berichtigt --- src/java/de/uhilger/filecms/api/FileMgr.java | 373 ++++++++++++++++++++++++++++++++--------------------- 1 files changed, 225 insertions(+), 148 deletions(-) diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java index 7f41566..8fb1ea3 100644 --- a/src/java/de/uhilger/filecms/api/FileMgr.java +++ b/src/java/de/uhilger/filecms/api/FileMgr.java @@ -20,14 +20,17 @@ import de.uhilger.filecms.data.FileRef; import de.uhilger.filecms.web.Initialiser; -//import de.uhilger.filesystem.FileRef; -//import de.uhilger.filesystem.FileSystem; -//import de.uhilger.filesystem.LocalFileSystem; +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.FileNotFoundException; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; +import java.io.Reader; import java.security.Principal; import java.util.ArrayList; import java.util.Iterator; @@ -43,10 +46,16 @@ public class FileMgr extends Api { private static final Logger logger = Logger.getLogger(FileMgr.class.getName()); + public static final String WBX_DATA_PATH = "daten/"; public static final String PUB_DIR_PATH = "www/"; public static final String HOME_DIR_PATH = "home/"; public static final String PUB_DIR_NAME = "Oeffentlich"; - public static final String HOME_DIR_NAME = "Persoenlicher Ordner"; + //public static final String HOME_DIR_NAME = "Persoenlicher Ordner"; + public static final String HOME_DIR_NAME = "Persoenlich"; + public static final String WBX_ADMIN_ROLE = "wbxAdmin"; + + public static final String WBX_BASE = "$basis"; + public static final String WBX_DATA = "$daten"; public static final int OP_COPY = 1; public static final int OP_MOVE = 2; @@ -55,7 +64,18 @@ return "Hallo Welt!"; } + /** + * Inhalte der WebBox listen. Hier wird nur der relative Pfad + * ausgehend von www oder home ausgegeben sowie zudem ausgehend + * von $daten und $basis, sofern der Benutzer die Rolle wbxAdmin hat. + * + * Andere Inhalte werden nicht ausgegeben. + * + * @param relPath + * @return + */ public List<FileRef> list(String relPath) { + Bild bild = new Bild(); List<FileRef> files = new ArrayList(); if(relPath.length() == 0) { FileRef namedPublicFolder = new FileRef(PUB_DIR_NAME, true); @@ -64,17 +84,19 @@ logger.finer(namedHomeFolder.getAbsolutePath()); files = new ArrayList(); files.add(namedHomeFolder); - files.add(namedPublicFolder); + files.add(namedPublicFolder); + 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); - //LocalFileSystem fs = new LocalFileSystem(); - //logger.fine("listing " + getTargetDir(relPath).getAbsolutePath()); File dir = new File(path); if(dir.exists()) { File[] fileArray = dir.listFiles(); - - //FileRef[] fileRefs = fs.list(new FileRef(getTargetDir(relPath).getAbsolutePath(), true)); for(int i = 0; i < fileArray.length; i++) { logger.fine(fileArray[i].toURI().toString()); String fname = fileArray[i].toURI().toString().replace("file:/", ""); @@ -82,7 +104,9 @@ fname = fname.substring(0, fname.length() - 1); } logger.fine(fname); - files.add(new FileRef(fname, fileArray[i].isDirectory())); + FileRef ref = new FileRef(fname, fileArray[i].isDirectory()); + ref.setMimetype(bild.getMimeType(fileArray[i])); + files.add(ref); } } } @@ -110,9 +134,12 @@ Object p = getRequest().getUserPrincipal(); if(p instanceof Principal) { - FileReader reader = null; + 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]; @@ -173,32 +200,14 @@ } public String copyFiles(String fromPath, String toPath, List fileNames) { - 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()) { - logger.fine("copy dir " + srcFile.getAbsolutePath() + " to dir " + targetDir.getAbsolutePath()); - FileUtils.copyDirectoryToDirectory(srcFile, targetDir); - } else { - logger.fine("copy srcFile " + srcFile.getAbsolutePath() + " to dir " + targetDir.getAbsolutePath()); - FileUtils.copyFileToDirectory(srcFile, targetDir); - } - } - } - } catch (IOException ex) { - logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); - } - return result; + return copyOrMoveFiles(fromPath, toPath, fileNames, OP_COPY); } public String moveFiles(String fromPath, String toPath, List fileNames) { + return copyOrMoveFiles(fromPath, toPath, fileNames, OP_MOVE); + } + + private String copyOrMoveFiles(String fromPath, String toPath, List fileNames, int operation) { String result = null; try { File srcDir = getTargetDir(fromPath); @@ -210,9 +219,17 @@ ArrayList al = (ArrayList) o; File srcFile = new File(srcDir, al.get(0).toString()); if(srcFile.isDirectory()) { - FileUtils.moveDirectoryToDirectory(srcFile, targetDir, false); + if(operation == OP_MOVE) { + FileUtils.moveDirectoryToDirectory(srcFile, targetDir, false); + } else { + FileUtils.copyDirectoryToDirectory(srcFile, targetDir); + } } else { - FileUtils.moveFileToDirectory(srcFile, targetDir, false); + if(operation == OP_MOVE) { + FileUtils.moveFileToDirectory(srcFile, targetDir, false); + } else { + FileUtils.copyFileToDirectory(srcFile, targetDir); + } } } } @@ -220,106 +237,187 @@ logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); } return result; - //return copyOrMoveFiles(fromPath, toPath, fileNames, OP_MOVE); } - /** - * Dateien kopieren - * - * @param fromPath der relative Pfad, aus dem die Dateien stammen, die kopiert werden sollen - * @param toPath der relative Pfad, an den die Dateien kopiert werden sollen - * @param fileNames Liste mit Namen der Dateien, die kopiert werden sollen - * @param operation OP_COPY oder OP_MOVE - * @return null bei Fehler oder Quittungstext, wenn erfolgreich - */ - /* - private String copyOrMoveFiles(String fromPath, String toPath, List fileNames, int operation) { - String result = null; - try { - FileRef[] files = new FileRef[fileNames.size()]; - logger.fine(fileNames.toString()); - File srcDir = getTargetDir(fromPath); - 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 srcFile = new File(srcDir, al.get(0).toString()); - logger.fine(srcFile.getAbsolutePath()); - files[i] = new FileRef(srcFile.getAbsolutePath(), srcFile.isDirectory()); - } - } - File targetDir = getTargetDir(toPath); - FileSystem fs = new LocalFileSystem(); - switch(operation) { - case OP_COPY: - fs.copy(files, new FileRef(targetDir.getAbsolutePath(), true)); - FileUtils.copy - break; - case OP_MOVE: - fs.move(files, new FileRef(targetDir.getAbsolutePath(), true)); - break; - } - result = "kopiert"; - } catch (Throwable ex) { - logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); - } - return result; - } - */ - - public FileRef saveTextFile(String relPath, String fileName, String contents) { + public FileRef saveTextFileAs(String relPath, String fileName, String contents) { FileRef savedFile = null; - try { - FileRef datenRef = getBase(); - //File daten = new File(datenRef.getAbsolutePath()); - 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(); - } - targetFile.createNewFile(); - FileWriter w = new FileWriter(targetFile); - w.write(contents); - w.flush(); - w.close(); - savedFile = new FileRef( - targetFile.getAbsolutePath(), - targetFile.isDirectory(), - targetFile.isHidden(), - targetFile.lastModified(), - targetFile.length()); + 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(); } - } catch (IOException ex) { - logger.log(Level.SEVERE, null, ex); + saveToFile(targetFile, contents); } return savedFile; } + + private File getNewFileName(File file) { + File dir = file.getParentFile(); + String targetName = file.getName(); + logger.fine("targetName: " + targetName); + String ext = ""; + int dotpos = targetName.indexOf("."); + if(dotpos > -1) { + ext = targetName.substring(dotpos); + targetName = targetName.substring(0, dotpos); + } + logger.fine("targetName: " + targetName + ", ext: " + ext); + int i = 1; + while(file.exists()) { + StringBuffer buf = new StringBuffer(); + buf.append(targetName); + buf.append("-"); + buf.append(i); + if(ext.length() > 0) { + buf.append(ext); + } + file = new File(dir, buf.toString()); + i++; + } + logger.fine("new file: " + file.getName()); + return file; + } + + private FileRef saveToFile(File targetFile, String contents) { + FileRef savedFile = null; + try { + targetFile.createNewFile(); + FileWriter w = new FileWriter(targetFile); + //w.write(StringEscapeUtils.unescapeHtml(contents)); + w.write(contents); + w.flush(); + w.close(); + savedFile = new FileRef( + targetFile.getAbsolutePath(), + targetFile.isDirectory(), + targetFile.isHidden(), + targetFile.lastModified(), + targetFile.length()); + } catch (IOException ex) { + logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); + } + return savedFile; + } + + 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(); + } + 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++) { + //int gr = bild.getVariantenGroesse(i); + + String ext = ""; + String nurname = bildName; + int dotpos = bildName.indexOf("."); + if (dotpos > -1) { + 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)); + } + } + } + } catch(IOException | InterruptedException ex) { + logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); + } + + return "ok"; + } + /* ---- Hilfsfunktionen ---- */ + /** + * Einen relativen Pfad in einen absoluten Pfad der WebBox + * aufloesen. + * + * Nur die absoluten Pfade zu PUB_DIR_NAME, HOME_DIR_NAME + * sowie WBX_BASE und WBX_DATA werden ausgegeben. Letztere + * beiden nur fuer Nutzer mit der Rolle WBX_ADMIN_ROLE. + * + * D.h., es werden nur Pfade aufgeloest, die sich innerhalb + * des Ordners der WeBox befinden. + * + * @param relPath + * @return + */ private File getTargetDir(String relPath) { logger.fine(relPath); + File targetDir; String targetPath = null; if(relPath.startsWith(PUB_DIR_NAME)) { targetPath = PUB_DIR_PATH + getUserName() + relPath.substring(PUB_DIR_NAME.length()); + targetDir = new File(getBase().getAbsolutePath(), targetPath); } else if(relPath.startsWith(HOME_DIR_NAME)) { targetPath = HOME_DIR_PATH + getUserName() + relPath.substring(HOME_DIR_NAME.length()); + targetDir = new File(getBase().getAbsolutePath(), targetPath); + } else if(getRequest().isUserInRole(WBX_ADMIN_ROLE)) { + if(relPath.startsWith(WBX_BASE)) { + targetPath = getCatalinaBase(); + targetDir = new File(targetPath, relPath.substring(WBX_BASE.length())); + } else if(relPath.startsWith(WBX_DATA)) { + targetPath = getWbxDataDir(); + targetDir = new File(targetPath, relPath.substring(WBX_BASE.length())); + } else { + targetDir = getDefaultDir(relPath); + } } else { // kann eigentlich nicht sein.. + targetDir = getDefaultDir(relPath); } logger.fine(targetPath); - File targetDir = new File(getBase().getAbsolutePath(), targetPath); + //File targetDir = new File(getBase().getAbsolutePath(), targetPath); return targetDir; + } + + private File getDefaultDir(String relPath) { + String targetPath = PUB_DIR_PATH + getUserName() + relPath.substring(PUB_DIR_NAME.length()); + return new File(getBase().getAbsolutePath(), targetPath); } private FileRef getBase() { @@ -341,40 +439,19 @@ userName = ((Principal) p).getName(); } return userName; + } + + private String getCatalinaBase() { + String path = getServletContext().getRealPath("/"); + logger.fine("getRealPath: " + path); // file-cms in webapps + File file = new File(path); + file = file.getParentFile().getParentFile(); + return file.getAbsolutePath(); } - /* - private File getWebappsDir() { - File cfile = new File(this.getClass().getResource( - this.getClass().getSimpleName() + ".class").getFile()); - String path = cfile.getAbsolutePath(); - return new File(path.substring(0, path.indexOf(getRequest().getContextPath()))); + private String getWbxDataDir() { + String wbxBase = getBase().getAbsolutePath(); + File file = new File(wbxBase); + return file.getAbsolutePath(); } - */ - -} - - -/* - https://stackoverflow.com/questions/300559/move-copy-file-operations-in-java - - - -Try to use org.apache.commons.io.FileUtils (General file manipulation utilities). Facilities are provided in the following methods: - - (1) FileUtils.moveDirectory(File srcDir, File destDir) => Moves a directory. - - (2) FileUtils.moveDirectoryToDirectory(File src, File destDir, boolean createDestDir) => Moves a directory to another directory. - - (3) FileUtils.moveFile(File srcFile, File destFile) => Moves a file. - - (4) FileUtils.moveFileToDirectory(File srcFile, File destDir, boolean createDestDir) => Moves a file to a directory. - - (5) FileUtils.moveToDirectory(File src, File destDir, boolean createDestDir) => Moves a file or directory to the destination directory. - -It's simple, easy and fast. - - - https://commons.apache.org/proper/commons-io/javadocs/api-2.5/org/apache/commons/io/FileUtils.html - -*/ \ No newline at end of file +} \ No newline at end of file -- Gitblit v1.9.3