From d10a84157a8acdc8050d9e57e98c9cb53131827b Mon Sep 17 00:00:00 2001 From: ulrich <not disclosed> Date: Tue, 21 Feb 2017 10:29:49 +0000 Subject: [PATCH] HomeFilter entfernt --- src/java/de/uhilger/filecms/api/FileMgr.java | 116 +++++++++++++++++++++++++++++++++------------------------- 1 files changed, 66 insertions(+), 50 deletions(-) diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java index a985185..e79970a 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,66 +42,47 @@ 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; - - public String hallo() { return "Hallo Welt!"; } 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 { - - } - + 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()); + } + } return files; } - private FileRef getBase() { - FileRef base = null; - Object o = getServletContext().getAttribute(Initialiser.FILE_BASE); - if(o instanceof FileRef) { - base = (FileRef) o; + public FileRef newFolder(String relPath, String folderName) { + logger.finer(relPath); + String targetPath = null; + if(relPath.startsWith(PUB_DIR_NAME)) { + targetPath = PUB_DIR_PATH + getUserName() + "/" + relPath.substring(PUB_DIR_NAME.length()) + "/" + folderName; + } else if(relPath.startsWith(HOME_DIR_NAME)) { + targetPath = HOME_DIR_PATH + getUserName() + "/" + relPath.substring(HOME_DIR_NAME.length()) + "/" + folderName; + } else { + // kann eigentlich nicht sein.. } - return base; - } - - private File getUserPubDir() { - File userDir = null; - File daten = new File(getBase().getAbsolutePath()); - Object p = getRequest().getUserPrincipal(); - if(p instanceof Principal) { - userDir = new File(daten, PUB_DIR_PATH + ((Principal) p).getName()); - } - return userDir; - } - - private File getUserHomeDir() { - File userDir = null; - File daten = new File(getBase().getAbsolutePath()); - Object p = getRequest().getUserPrincipal(); - if(p instanceof Principal) { - userDir = new File(daten, HOME_DIR_PATH + ((Principal) p).getName()); - } - return userDir; + logger.finer(targetPath); + File targetDir = new File(getBase().getAbsolutePath(), targetPath); + targetDir.mkdirs(); + return new FileRef(targetDir.getAbsolutePath(), true); } public FileRef saveTextFile(String relPath, String fileName, String contents) { @@ -110,9 +92,7 @@ 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? @@ -141,12 +121,48 @@ } return savedFile; } + + /* ---- Hilfsfunktionen ---- */ + 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() { + FileRef base = null; + Object o = getServletContext().getAttribute(Initialiser.FILE_BASE); + if(o instanceof FileRef) { + base = (FileRef) o; + } + return base; + } + + private String getUserName() { + String userName = null; + Object p = getRequest().getUserPrincipal(); + if(p instanceof Principal) { + 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()))); } + */ } -- Gitblit v1.9.3