From 8446c2f13232851efc3d8ae51872017d1862bf20 Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Thu, 02 Mar 2017 18:16:05 +0000 Subject: [PATCH] Umbenennen (in Arbeit) --- src/java/de/uhilger/filecms/api/FileMgr.java | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 101 insertions(+), 16 deletions(-) diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java index 52c4e8e..2dcdcd8 100644 --- a/src/java/de/uhilger/filecms/api/FileMgr.java +++ b/src/java/de/uhilger/filecms/api/FileMgr.java @@ -18,10 +18,11 @@ 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 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 +30,11 @@ 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; /** * @@ -64,13 +67,23 @@ files.add(namedPublicFolder); } else { String path = getTargetDir(relPath).getAbsolutePath(); - 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.fine("added " + fileRefs[i].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:/", ""); + if(fileArray[i].isDirectory()) { + fname = fname.substring(0, fname.length() - 1); + } + logger.fine(fname); + files.add(new FileRef(fname, fileArray[i].isDirectory())); + } } } return files; @@ -129,7 +142,6 @@ 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++) { @@ -139,11 +151,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); @@ -152,11 +166,54 @@ } public String copyFiles(String fromPath, String toPath, List fileNames) { - return copyOrMoveFiles(fromPath, toPath, fileNames, OP_COPY); + 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; } public String moveFiles(String fromPath, String toPath, List fileNames) { - return copyOrMoveFiles(fromPath, toPath, fileNames, OP_MOVE); + 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()) { + FileUtils.moveDirectoryToDirectory(srcFile, targetDir, false); + } else { + FileUtils.moveFileToDirectory(srcFile, targetDir, false); + } + } + } + } catch (IOException ex) { + logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex); + } + return result; + //return copyOrMoveFiles(fromPath, toPath, fileNames, OP_MOVE); } /** @@ -168,6 +225,7 @@ * @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 { @@ -189,6 +247,7 @@ 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)); @@ -200,6 +259,7 @@ } return result; } + */ public FileRef saveTextFile(String relPath, String fileName, String contents) { FileRef savedFile = null; @@ -286,3 +346,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