From 663ee9d3828b536f857f54ab1fc66c6f28095027 Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Thu, 02 Mar 2017 21:28:04 +0000
Subject: [PATCH] Umbenennen
---
src/java/de/uhilger/filecms/api/FileMgr.java | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 162 insertions(+), 15 deletions(-)
diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java
index d045623..7f41566 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;
/**
*
@@ -44,6 +47,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 +67,23 @@
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);
+ //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;
@@ -122,10 +139,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,17 +158,115 @@
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);
}
return result;
}
+
+ 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;
+ }
+
+ public String moveFiles(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()) {
+ 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);
+ }
+
+ /**
+ * 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) {
FileRef savedFile = null;
@@ -190,9 +311,9 @@
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..
}
@@ -200,6 +321,7 @@
File targetDir = new File(getBase().getAbsolutePath(), targetPath);
return targetDir;
}
+
private FileRef getBase() {
FileRef base = null;
Object o = getServletContext().getAttribute(Initialiser.FILE_BASE);
@@ -231,3 +353,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