From ea1ae0d0da0d945518a99e7d6e96670e7e28fb45 Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Mon, 06 Mar 2017 16:20:27 +0000 Subject: [PATCH] eigene Stile fuer TinyMCE; Link zur Hauptseite auf Login-Form --- src/java/de/uhilger/filecms/api/FileMgr.java | 224 +++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 164 insertions(+), 60 deletions(-) diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java index 78ac92d..cb4ca87 100644 --- a/src/java/de/uhilger/filecms/api/FileMgr.java +++ b/src/java/de/uhilger/filecms/api/FileMgr.java @@ -18,10 +18,8 @@ package de.uhilger.filecms.api; +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 java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; @@ -29,9 +27,12 @@ import java.io.IOException; import java.security.Principal; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang.StringEscapeUtils; /** * @@ -44,6 +45,9 @@ 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 int OP_COPY = 1; + public static final int OP_MOVE = 2; public String hallo() { return "Hallo Welt!"; @@ -61,12 +65,19 @@ files.add(namedPublicFolder); } else { String path = getTargetDir(relPath).getAbsolutePath(); - logger.fine(path); - LocalFileSystem fs = new LocalFileSystem(); - FileRef[] fileRefs = fs.list(new FileRef(getTargetDir(relPath).getAbsolutePath(), true)); - for(int i = 0; i < fileRefs.length; i++) { - files.add(fileRefs[i]); - logger.finer("added " + fileRefs[i].getAbsolutePath()); + logger.fine("listing path: " + path); + File dir = new File(path); + if(dir.exists()) { + File[] fileArray = dir.listFiles(); + 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); + files.add(new FileRef(fname, fileArray[i].isDirectory())); + } } } return files; @@ -122,10 +133,16 @@ 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; + } + public String deleteFiles(String relPath, List fileNames) { String result = null; try { - FileRef[] delRefs = new FileRef[fileNames.size()]; logger.fine(fileNames.toString()); File targetDir = getTargetDir(relPath); for(int i=0; i < fileNames.size(); i++) { @@ -135,11 +152,13 @@ logger.fine(al.get(0).toString()); File targetFile = new File(targetDir, al.get(0).toString()); logger.fine(targetFile.getAbsolutePath()); - delRefs[i] = new FileRef(targetFile.getAbsolutePath(), targetFile.isDirectory()); + if(targetFile.isDirectory()) { + FileUtils.deleteDirectory(targetFile); + } else { + targetFile.delete(); + } } } - FileSystem fs = new LocalFileSystem(); - fs.delete(delRefs); result = "deleted"; } catch (Throwable ex) { logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); @@ -147,39 +166,130 @@ return result; } - public FileRef saveTextFile(String relPath, String fileName, String contents) { - FileRef savedFile = null; + public String copyFiles(String fromPath, String toPath, List fileNames) { + 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 { - 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(); + 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 { + if(operation == OP_MOVE) { + FileUtils.moveFileToDirectory(srcFile, targetDir, false); + } else { + FileUtils.copyFileToDirectory(srcFile, targetDir); + } + } } - 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()); } } catch (IOException ex) { - logger.log(Level.SEVERE, null, ex); + logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); + } + return result; + } + + 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(); + } + 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; } @@ -187,24 +297,28 @@ /* ---- Hilfsfunktionen ---- */ private File getTargetDir(String relPath) { - logger.finer(relPath); + logger.fine(relPath); String targetPath = null; if(relPath.startsWith(PUB_DIR_NAME)) { - targetPath = PUB_DIR_PATH + getUserName() + "/" + relPath.substring(PUB_DIR_NAME.length()); + targetPath = PUB_DIR_PATH + getUserName() + relPath.substring(PUB_DIR_NAME.length()); } else if(relPath.startsWith(HOME_DIR_NAME)) { - targetPath = HOME_DIR_PATH + getUserName() + "/" + relPath.substring(HOME_DIR_NAME.length()); + targetPath = HOME_DIR_PATH + getUserName() + relPath.substring(HOME_DIR_NAME.length()); } else { // kann eigentlich nicht sein.. } - logger.finer(targetPath); + logger.fine(targetPath); File targetDir = new File(getBase().getAbsolutePath(), targetPath); return targetDir; } + private FileRef getBase() { FileRef base = null; Object o = getServletContext().getAttribute(Initialiser.FILE_BASE); - if(o instanceof FileRef) { - base = (FileRef) o; + if(o instanceof String) { + String baseStr = (String) o; + logger.fine(baseStr); + File file = new File(baseStr); + base = new FileRef(file.getAbsolutePath(), file.isDirectory()); } return base; } @@ -216,15 +330,5 @@ userName = ((Principal) p).getName(); } return userName; - } - - /* - 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()))); - } - */ - -} + } +} \ No newline at end of file -- Gitblit v1.9.3