From 5dfab6ee05a6926a84c068ee0ebcabab1480c9c5 Mon Sep 17 00:00:00 2001
From: ulrich <not disclosed>
Date: Mon, 20 Feb 2017 13:59:25 +0000
Subject: [PATCH] list in Arbeit
---
src/java/de/uhilger/filecms/api/FileMgr.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java
index a985185..55fead9 100644
--- a/src/java/de/uhilger/filecms/api/FileMgr.java
+++ b/src/java/de/uhilger/filecms/api/FileMgr.java
@@ -20,11 +20,13 @@
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;
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;
@@ -52,23 +54,41 @@
}
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());
+ logger.finer(namedPublicFolder.getAbsolutePath());
namedHomeFolder = new FileRef(HOME_DIR_NAME, true);
- logger.info(namedHomeFolder.getAbsolutePath());
+ logger.finer(namedHomeFolder.getAbsolutePath());
files = new ArrayList<FileRef>();
files.add(namedHomeFolder);
files.add(namedPublicFolder);
} else {
+ logger.info(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.info(targetPath);
+ File targetDir = new File(getBase().getAbsolutePath(), targetPath);
+ LocalFileSystem fs = new LocalFileSystem();
+ FileRef[] fileRefs = fs.list(new FileRef(targetDir.getAbsolutePath(), true));
+ for(int i = 0; i < fileRefs.length; i++) {
+ files.add(fileRefs[i]);
+ }
+ //files = Arrays.asList(fileRefs);
}
return files;
@@ -93,6 +113,15 @@
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());
--
Gitblit v1.9.3