From fab629ffb99008bce86082033d349f42ba13b93a Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Sun, 05 Mar 2017 08:04:40 +0000
Subject: [PATCH] redundanz bei copy und move beseitigt
---
src/java/de/uhilger/filecms/api/FileMgr.java | 105 ++++++++++++++++++++++++----------------------------
1 files changed, 49 insertions(+), 56 deletions(-)
diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java
index 52c4e8e..649357d 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,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 +64,19 @@
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);
+ 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;
@@ -126,10 +132,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++) {
@@ -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);
@@ -159,43 +173,33 @@
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) {
+ File targetDir = getTargetDir(toPath);
+ Iterator i = fileNames.iterator();
+ while(i.hasNext()) {
+ Object o = i.next();
+ 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());
+ 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);
+ }
+ }
}
}
- 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) {
+ } catch (IOException ex) {
logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
}
return result;
@@ -205,7 +209,6 @@
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);
@@ -274,15 +277,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