From 8a09f479c1f66d750f0fa73bd4e4f1a993a9bfff Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Tue, 28 Feb 2017 22:52:08 +0000 Subject: [PATCH] Doku ergänzt --- src/java/de/uhilger/filecms/api/FileMgr.java | 126 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 117 insertions(+), 9 deletions(-) diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java index d70f816..6359213 100644 --- a/src/java/de/uhilger/filecms/api/FileMgr.java +++ b/src/java/de/uhilger/filecms/api/FileMgr.java @@ -20,13 +20,13 @@ 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; import java.io.FileWriter; import java.io.IOException; -import java.io.StringReader; import java.security.Principal; import java.util.ArrayList; import java.util.List; @@ -45,6 +45,9 @@ 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 +64,13 @@ files.add(namedPublicFolder); } else { String path = getTargetDir(relPath).getAbsolutePath(); - logger.fine(path); + logger.fine("path: " + path); LocalFileSystem fs = new LocalFileSystem(); + logger.fine("listing " + getTargetDir(relPath).getAbsolutePath()); 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("added " + fileRefs[i].getAbsolutePath()); } } return files; @@ -122,6 +126,81 @@ return code; } + 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++) { + 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()); + delRefs[i] = new FileRef(targetFile.getAbsolutePath(), targetFile.isDirectory()); + } + } + FileSystem fs = new LocalFileSystem(); + fs.delete(delRefs); + result = "deleted"; + } catch (Throwable ex) { + logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); + } + return result; + } + + 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); + } + + /** + * 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)); + 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) { FileRef savedFile = null; try { @@ -162,24 +241,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; } @@ -203,3 +286,28 @@ */ } + + +/* + 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 -- Gitblit v1.9.3