From 736eb25d88b6acf28cb6fb8702ee0ee0772678a2 Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Sat, 04 Mar 2017 00:44:34 +0000 Subject: [PATCH] stile --- src/java/de/uhilger/filecms/api/FileMgr.java | 142 ++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 114 insertions(+), 28 deletions(-) diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java index d70f816..b3adeaf 100644 --- a/src/java/de/uhilger/filecms/api/FileMgr.java +++ b/src/java/de/uhilger/filecms/api/FileMgr.java @@ -18,20 +18,20 @@ 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.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.Iterator; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import org.apache.commons.io.FileUtils; /** * @@ -44,6 +44,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 +64,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,11 +132,93 @@ 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 { + 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()); + if(targetFile.isDirectory()) { + FileUtils.deleteDirectory(targetFile); + } else { + targetFile.delete(); + } + } + } + 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; + } + public FileRef saveTextFile(String relPath, String fileName, String contents) { 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); @@ -162,24 +254,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; } @@ -191,15 +287,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