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 | 78 +++++++++++++++++++++++++++++++++------ 1 files changed, 66 insertions(+), 12 deletions(-) diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java index a985185..20277a1 100644 --- a/src/java/de/uhilger/filecms/api/FileMgr.java +++ b/src/java/de/uhilger/filecms/api/FileMgr.java @@ -20,6 +20,7 @@ import de.uhilger.filecms.web.Initialiser; import de.uhilger.filesystem.FileRef; +import de.uhilger.filesystem.LocalFileSystem; import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -41,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() { @@ -52,26 +53,64 @@ } public List<FileRef> list(String relPath) { - List<FileRef> files = null; + List<FileRef> files = new ArrayList(); if(relPath.length() == 0) { + /* publicFolder = new FileRef(getUserPubDir().getAbsolutePath(), true); logger.info(publicFolder.getAbsolutePath()); homeFolder = new FileRef(getUserHomeDir().getAbsolutePath(), true); logger.info(homeFolder.getAbsolutePath()); - - namedPublicFolder = new FileRef(PUB_DIR_NAME, true); - logger.info(namedPublicFolder.getAbsolutePath()); - namedHomeFolder = new FileRef(HOME_DIR_NAME, true); - logger.info(namedHomeFolder.getAbsolutePath()); - files = new ArrayList<FileRef>(); + */ + FileRef namedPublicFolder = new FileRef(PUB_DIR_NAME, true); + logger.finer(namedPublicFolder.getAbsolutePath()); + FileRef namedHomeFolder = new FileRef(HOME_DIR_NAME, true); + logger.finer(namedHomeFolder.getAbsolutePath()); + files = new ArrayList(); files.add(namedHomeFolder); files.add(namedPublicFolder); } else { + /* + 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); + */ + LocalFileSystem fs = new LocalFileSystem(); + 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() { @@ -83,6 +122,7 @@ return base; } + /* private File getUserPubDir() { File userDir = null; File daten = new File(getBase().getAbsolutePath()); @@ -92,7 +132,18 @@ } return userDir; } + */ + private String getUserName() { + String userName = null; + Object p = getRequest().getUserPrincipal(); + if(p instanceof Principal) { + userName = ((Principal) p).getName(); + } + return userName; + } + + /* private File getUserHomeDir() { File userDir = null; File daten = new File(getBase().getAbsolutePath()); @@ -102,6 +153,7 @@ } return userDir; } + */ public FileRef saveTextFile(String relPath, String fileName, String contents) { FileRef savedFile = null; @@ -110,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