From 2121ccd4015d7c0dc81485fcaf8655bde28ea396 Mon Sep 17 00:00:00 2001 From: ulrich <not disclosed> Date: Mon, 20 Feb 2017 15:35:43 +0000 Subject: [PATCH] Dateien bearbeiten in Arbeit --- src/java/de/uhilger/filecms/api/FileMgr.java | 49 +++++++++++++++++++++++++++++++++++++------------ 1 files changed, 37 insertions(+), 12 deletions(-) diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java index 55fead9..20277a1 100644 --- a/src/java/de/uhilger/filecms/api/FileMgr.java +++ b/src/java/de/uhilger/filecms/api/FileMgr.java @@ -26,7 +26,6 @@ import java.io.IOException; import java.security.Principal; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; @@ -43,10 +42,10 @@ public static final String PUB_DIR_NAME = "Oeffentlich"; public static final String HOME_DIR_NAME = "Persoenlicher Ordner"; - private FileRef homeFolder; - private FileRef publicFolder; - private FileRef namedHomeFolder; - private FileRef namedPublicFolder; + //private FileRef homeFolder; + //private FileRef publicFolder; + //private FileRef namedHomeFolder; + //private FileRef namedPublicFolder; public String hallo() { @@ -63,15 +62,16 @@ homeFolder = new FileRef(getUserHomeDir().getAbsolutePath(), true); logger.info(homeFolder.getAbsolutePath()); */ - namedPublicFolder = new FileRef(PUB_DIR_NAME, true); + FileRef namedPublicFolder = new FileRef(PUB_DIR_NAME, true); logger.finer(namedPublicFolder.getAbsolutePath()); - namedHomeFolder = new FileRef(HOME_DIR_NAME, true); + FileRef namedHomeFolder = new FileRef(HOME_DIR_NAME, true); logger.finer(namedHomeFolder.getAbsolutePath()); - files = new ArrayList<FileRef>(); + files = new ArrayList(); files.add(namedHomeFolder); files.add(namedPublicFolder); } else { - logger.info(relPath); + /* + logger.finer(relPath); String targetPath = null; if(relPath.startsWith(PUB_DIR_NAME)) { targetPath = PUB_DIR_PATH + getUserName() + "/" + relPath.substring(PUB_DIR_NAME.length()); @@ -80,18 +80,37 @@ } else { // kann eigentlich nicht sein.. } - logger.info(targetPath); + logger.finer(targetPath); File targetDir = new File(getBase().getAbsolutePath(), targetPath); + */ LocalFileSystem fs = new LocalFileSystem(); - FileRef[] fileRefs = fs.list(new FileRef(targetDir.getAbsolutePath(), true)); + String path = getTargetDir(relPath).getAbsolutePath(); + logger.fine(path); + 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()); } //files = Arrays.asList(fileRefs); } return files; + } + + private File getTargetDir(String relPath) { + logger.finer(relPath); + String targetPath = null; + if(relPath.startsWith(PUB_DIR_NAME)) { + 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()); + } else { + // kann eigentlich nicht sein.. + } + logger.finer(targetPath); + File targetDir = new File(getBase().getAbsolutePath(), targetPath); + return targetDir; } private FileRef getBase() { @@ -103,6 +122,7 @@ return base; } + /* private File getUserPubDir() { File userDir = null; File daten = new File(getBase().getAbsolutePath()); @@ -112,6 +132,7 @@ } return userDir; } + */ private String getUserName() { String userName = null; @@ -122,6 +143,7 @@ return userName; } + /* private File getUserHomeDir() { File userDir = null; File daten = new File(getBase().getAbsolutePath()); @@ -131,6 +153,7 @@ } return userDir; } + */ public FileRef saveTextFile(String relPath, String fileName, String contents) { FileRef savedFile = null; @@ -139,9 +162,11 @@ File daten = new File(datenRef.getAbsolutePath()); Object p = getRequest().getUserPrincipal(); if(p instanceof Principal) { + /* File userDir = new File(daten, "www/" + ((Principal) p).getName()); File saveDir = new File(userDir, relPath); - File targetFile = new File(saveDir, fileName); + */ + File targetFile = new File(getTargetDir(relPath), fileName); if(targetFile.exists()) { /* muss delete() sein? -- Gitblit v1.9.3