From 3c4b104eb3d9bf4e651dffbbd956985764bcacce Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Tue, 28 Feb 2017 07:19:53 +0000 Subject: [PATCH] getBase angepasst --- src/java/de/uhilger/filecms/api/FileMgr.java | 75 +++++++++++++++++++++++++++++++++++-- 1 files changed, 70 insertions(+), 5 deletions(-) diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java index e79970a..d045623 100644 --- a/src/java/de/uhilger/filecms/api/FileMgr.java +++ b/src/java/de/uhilger/filecms/api/FileMgr.java @@ -20,8 +20,11 @@ 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.security.Principal; @@ -85,11 +88,70 @@ return new FileRef(targetDir.getAbsolutePath(), true); } + public String getCode(String relPath, String fileName) { + String code = null; + + Object p = getRequest().getUserPrincipal(); + if(p instanceof Principal) { + FileReader reader = null; + try { + File targetFile = new File(getTargetDir(relPath), fileName); + reader = new FileReader(targetFile); + StringBuffer buf = new StringBuffer(); + char[] readBuffer = new char[1024]; + int charsRead = reader.read(readBuffer); + while(charsRead > -1) { + buf.append(readBuffer, 0, charsRead); + charsRead = reader.read(readBuffer); + } + code = buf.toString(); + } catch (FileNotFoundException ex) { + Logger.getLogger(FileMgr.class.getName()).log(Level.SEVERE, null, ex); + } catch (IOException ex) { + Logger.getLogger(FileMgr.class.getName()).log(Level.SEVERE, null, ex); + } finally { + try { + reader.close(); + } catch (IOException ex) { + Logger.getLogger(FileMgr.class.getName()).log(Level.SEVERE, null, ex); + } + } + + } + + 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 FileRef saveTextFile(String relPath, String fileName, String contents) { FileRef savedFile = null; try { FileRef datenRef = getBase(); - File daten = new File(datenRef.getAbsolutePath()); + //File daten = new File(datenRef.getAbsolutePath()); Object p = getRequest().getUserPrincipal(); if(p instanceof Principal) { File targetFile = new File(getTargetDir(relPath), fileName); @@ -125,7 +187,7 @@ /* ---- 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()); @@ -134,15 +196,18 @@ } 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; } -- Gitblit v1.9.3