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 | 253 +++++++++++++++++++++++++++++++-------------------
1 files changed, 156 insertions(+), 97 deletions(-)
diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java
index d39ab79..20277a1 100644
--- a/src/java/de/uhilger/filecms/api/FileMgr.java
+++ b/src/java/de/uhilger/filecms/api/FileMgr.java
@@ -1,95 +1,159 @@
+/*
+ Dateiverwaltung - File management in your browser
+ Copyright (C) 2017 Ulrich Hilger, http://uhilger.de
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
package de.uhilger.filecms.api;
+import de.uhilger.filecms.web.Initialiser;
import de.uhilger.filesystem.FileRef;
-import de.uhilger.transit.web.RequestKontext;
-import de.uhilger.transit.web.WebKontext;
+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.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
/**
*
* @author ulrich
*/
-public class FileMgr implements WebKontext, RequestKontext {
+public class FileMgr extends Api {
private static final Logger logger = Logger.getLogger(FileMgr.class.getName());
- public static final String FILE_BASE = "fileBase";
+ public static final String PUB_DIR_PATH = "www/";
+ public static final String HOME_DIR_PATH = "home/";
+ public static final String PUB_DIR_NAME = "Oeffentlich";
+ public static final String HOME_DIR_NAME = "Persoenlicher Ordner";
- private ServletContext ctx;
- private HttpServletRequest req;
+ //private FileRef homeFolder;
+ //private FileRef publicFolder;
+ //private FileRef namedHomeFolder;
+ //private FileRef namedPublicFolder;
+
public String hallo() {
return "Hallo Welt!";
}
- // http://localhost:8097/file-cms/rpc/de.uhilger.filecms.api.FileMgr/getBase/JSONNICE
- public FileRef getBase() {
- FileRef ref = null;
- //String fileBase = getServletContext().getInitParameter(FILE_BASE);
- // -Dfilecms.base=/pfad/zu/daten
- //String fileBase = System.getProperty("filecms.base");
- //File file = new File(fileBase);
- //logger.info(file.getAbsolutePath());
- //logger.info(getWebappsDir().getAbsolutePath());
+ public List<FileRef> list(String relPath) {
+ List<FileRef> files = new ArrayList();
- /*
- file = new File("."); liefert
- /home/ulrich/dev/lib/java/tomcat/tomcat2-8.5.9/bin/.
-
- ..auf der WebBox aber
- /home/ulrich/srv/wbx_probe/.
- ..weil das Startskript dort liegt
-
- der Tomcat der WebBox ist unter
- sys/jrs/tomcat/bin
-
- also z.B.
- /home/ulrich/srv/wbx_probe/sys/jrs/tomcat/bin
-
- das Datenverzeichnis ist z.B. auf
- /home/ulrich/srv/wbx_probe/daten
-
- dann ist das Datenverzeichnis unter
- ../../../daten
-
- Der Ausdruck file = new File("."); liefert stets den
- Ort von dem aus der Java-Prozess gestartet wurde.
-
- Die unten folgende Bestimmung des Datenverzeichnisses
- ist beschraenkt auf das Datenverzeichnis der WebBox,
- entweder relativ zum Startskript der WebBox oder
- dem Startskript von Tomcat, wie es aus Netbeans heraus
- waehrend der Entwicklung genutzt wird.
-
- Besser ware vielleicht eine Bestimmung ueber einen
- Systemparameter -Dfilecms.base=... wie weiter oben
- auskommentiert. Damit liesse sich das file-cms auch
- ohne WebBox einsetzen. Allerdings muss dann das
- Datenverzeichnis im Start-Skript gebildet werden,
- also ausserhalb von Java, wenn es dynamisch aus
- einem Pfad relativ zum Start-Skript erzeugt werden
- soll.
- */
-
- File file = new File(".");
- String path = file.getAbsolutePath();
- path = path.substring(0, path.length() - 1);
- file = new File(path);
- if(path.endsWith("bin")) {
- file = file.getParentFile().getParentFile().getParentFile();
+ if(relPath.length() == 0) {
+ /*
+ publicFolder = new FileRef(getUserPubDir().getAbsolutePath(), true);
+ logger.info(publicFolder.getAbsolutePath());
+ homeFolder = new FileRef(getUserHomeDir().getAbsolutePath(), true);
+ logger.info(homeFolder.getAbsolutePath());
+ */
+ 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);
}
- file = new File(file, "daten/");
- ref = new FileRef(file.getAbsolutePath(), file.isDirectory());
- return ref;
+
+ 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() {
+ FileRef base = null;
+ Object o = getServletContext().getAttribute(Initialiser.FILE_BASE);
+ if(o instanceof FileRef) {
+ base = (FileRef) o;
+ }
+ 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 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());
+ Object p = getRequest().getUserPrincipal();
+ if(p instanceof Principal) {
+ userDir = new File(daten, HOME_DIR_PATH + ((Principal) p).getName());
+ }
+ return userDir;
+ }
+ */
public FileRef saveTextFile(String relPath, String fileName, String contents) {
FileRef savedFile = null;
@@ -98,18 +162,33 @@
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);
- if(!targetFile.exists()) {
+ */
+ File targetFile = new File(getTargetDir(relPath), fileName);
+ if(targetFile.exists()) {
+ /*
+ muss delete() sein?
+ pruefen: ueberschreibt der FileWriter den alteen Inhalt oder
+ entsteht eine unerwuenschte Mischung aus altem und neuem
+ Inhalt?
+ */
+ targetFile.delete();
+ } else {
targetFile.getParentFile().mkdirs();
- targetFile.createNewFile();
- FileWriter w = new FileWriter(targetFile);
- w.write(contents);
- w.flush();
- w.close();
- savedFile = new FileRef(targetFile.getAbsolutePath(), targetFile.isDirectory(), targetFile.isHidden(), targetFile.lastModified(), targetFile.length());
}
+ targetFile.createNewFile();
+ FileWriter w = new FileWriter(targetFile);
+ w.write(contents);
+ w.flush();
+ w.close();
+ savedFile = new FileRef(
+ targetFile.getAbsolutePath(),
+ targetFile.isDirectory(),
+ targetFile.isHidden(),
+ targetFile.lastModified(),
+ targetFile.length());
}
} catch (IOException ex) {
logger.log(Level.SEVERE, null, ex);
@@ -118,30 +197,10 @@
}
private File getWebappsDir() {
- File cfile = new File(this.getClass().getResource(this.getClass().getSimpleName() + ".class").getFile());
+ File cfile = new File(this.getClass().getResource(
+ this.getClass().getSimpleName() + ".class").getFile());
String path = cfile.getAbsolutePath();
- return new File(path.substring(0, path.indexOf(req.getContextPath())));
+ return new File(path.substring(0, path.indexOf(getRequest().getContextPath())));
}
-
- @Override
- public ServletContext getServletContext() {
- return ctx;
- }
-
- @Override
- public void setServletContext(ServletContext servletContext) {
- this.ctx = servletContext;
- }
-
- @Override
- public HttpServletRequest getRequest() {
- return req;
- }
-
- @Override
- public void setRequest(HttpServletRequest r) {
- this.req = r;
- }
-
-
+
}
--
Gitblit v1.9.3