From fafe1b3b2b35a3c032a367d5ed76b243f6d654a9 Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Fri, 07 Jul 2017 06:11:29 +0000
Subject: [PATCH] API fuer Listings aus der oeffentlichen Ablage hinzugefuegt
---
src/java/de/uhilger/filecms/api/FileMgr.java | 153 +++++++++++++++++++++++++++++---------------------
1 files changed, 88 insertions(+), 65 deletions(-)
diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java
index b4ece2e..f45497f 100644
--- a/src/java/de/uhilger/filecms/api/FileMgr.java
+++ b/src/java/de/uhilger/filecms/api/FileMgr.java
@@ -18,41 +18,37 @@
package de.uhilger.filecms.api;
+import de.uhilger.filecms.data.Bild;
import de.uhilger.filecms.data.FileRef;
-import de.uhilger.filecms.web.Initialiser;
-import de.uhilger.wbx.Bild;
import java.awt.Container;
import java.awt.Image;
import java.awt.MediaTracker;
import java.awt.Toolkit;
import java.io.File;
import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
+import java.io.InputStream;
import java.io.Reader;
import java.security.Principal;
import java.util.ArrayList;
+import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
import org.apache.commons.io.FileUtils;
/**
- *
- * @author ulrich
+ * Methoden zur Verwaltung von Dateien
*/
public class FileMgr extends Api {
private static final Logger logger = Logger.getLogger(FileMgr.class.getName());
- 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";
- public static final String HOME_DIR_NAME = "Persoenlich";
-
- public static final String CATALINA_BASE_FOLDER = "base";
public static final int OP_COPY = 1;
public static final int OP_MOVE = 2;
@@ -61,6 +57,16 @@
return "Hallo Welt!";
}
+ /**
+ * Inhalte der WebBox listen. Hier wird nur der relative Pfad
+ * ausgehend von www oder home ausgegeben sowie zudem ausgehend
+ * von $daten und $basis, sofern der Benutzer die Rolle wbxAdmin hat.
+ *
+ * Andere Inhalte werden nicht ausgegeben.
+ *
+ * @param relPath
+ * @return
+ */
public List<FileRef> list(String relPath) {
Bild bild = new Bild();
List<FileRef> files = new ArrayList();
@@ -69,11 +75,15 @@
logger.finer(namedPublicFolder.getAbsolutePath());
FileRef namedHomeFolder = new FileRef(HOME_DIR_NAME, true);
logger.finer(namedHomeFolder.getAbsolutePath());
- FileRef namedBaseFolder = new FileRef(CATALINA_BASE_FOLDER, true);
files = new ArrayList();
files.add(namedHomeFolder);
- files.add(namedPublicFolder);
- files.add(namedBaseFolder);
+ files.add(namedPublicFolder);
+ if(getRequest().isUserInRole(WBX_ADMIN_ROLE)) {
+ FileRef namedBaseFolder = new FileRef(WBX_BASE, true);
+ FileRef namedDataFolder = new FileRef(WBX_DATA, true);
+ files.add(namedBaseFolder);
+ files.add(namedDataFolder);
+ }
} else {
String path = getTargetDir(relPath).getAbsolutePath();
logger.fine("listing path: " + path);
@@ -352,58 +362,71 @@
return "ok";
}
+
+ public String extractZipfile(String relPath, String filename) {
+ String result;
+ try {
+ File targetDir = getTargetDir(relPath);
+ File archive = new File(targetDir, filename);
+ if(extract(archive)) {
+ result = "ok";
+ } else {
+ result = "error while extracting";
+ }
+ } catch(Exception ex) {
+ result = ex.getLocalizedMessage();
+ logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
+ }
+ return result;
+ }
+
+ /**
+ * extract a given ZIP archive to the folder respective archive resides in
+ * @param archive the archive to extract
+ * @throws Exception
+ */
+ private boolean extract(File archive) throws Exception {
+ ZipFile zipfile = new ZipFile(archive);
+ Enumeration en = zipfile.entries();
+ while(en.hasMoreElements()) {
+ ZipEntry zipentry = (ZipEntry) en.nextElement();
+ unzip(zipfile, zipentry, archive.getParent());
+ }
+ zipfile.close();
+ return true;
+ }
+
+ /**
+ * unzip a given entry of a given zip file to a given location
+ * @param zipfile the zip file to read an entry from
+ * @param zipentry the zip entry to read
+ * @param destPath the path to the destination location for the extracted content
+ * @throws IOException
+ */
+ private void unzip(ZipFile zipfile, ZipEntry zipentry, String destPath) throws IOException {
+ byte buf[] = new byte[1024];
+ InputStream is = zipfile.getInputStream(zipentry);
+ String outFileName = destPath + File.separator + zipentry.getName();
+ File file = new File(outFileName);
+ if(!zipentry.isDirectory()) {
+ file.getParentFile().mkdirs();
+ if(!file.exists())
+ file.createNewFile();
+ FileOutputStream fos = new FileOutputStream(file);
+ int i = is.read(buf, 0, 1024);
+ while(i > -1) {
+ fos.write(buf, 0, i);
+ i = is.read(buf, 0, 1024);
+ }
+ fos.close();
+ is.close();
+ } else {
+ file.mkdirs();
+ }
+ }
+
+
/* ---- Hilfsfunktionen ---- */
- private File getTargetDir(String relPath) {
- logger.fine(relPath);
- File targetDir;
- String targetPath = null;
- if(relPath.startsWith(PUB_DIR_NAME)) {
- targetPath = PUB_DIR_PATH + getUserName() + relPath.substring(PUB_DIR_NAME.length());
- targetDir = new File(getBase().getAbsolutePath(), targetPath);
- } else if(relPath.startsWith(HOME_DIR_NAME)) {
- targetPath = HOME_DIR_PATH + getUserName() + relPath.substring(HOME_DIR_NAME.length());
- targetDir = new File(getBase().getAbsolutePath(), targetPath);
- } else if(relPath.startsWith(CATALINA_BASE_FOLDER)) {
- targetPath = getCatalinaBase();
- targetDir = new File(targetPath, relPath.substring(CATALINA_BASE_FOLDER.length()));
- } else {
- // kann eigentlich nicht sein..
- targetPath = PUB_DIR_PATH + getUserName() + relPath.substring(PUB_DIR_NAME.length());
- targetDir = new File(getBase().getAbsolutePath(), targetPath);
- }
- logger.fine(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 String) {
- String baseStr = (String) o;
- logger.fine(baseStr);
- File file = new File(baseStr);
- base = new FileRef(file.getAbsolutePath(), file.isDirectory());
- }
- return base;
- }
-
- private String getUserName() {
- String userName = null;
- Object p = getRequest().getUserPrincipal();
- if(p instanceof Principal) {
- userName = ((Principal) p).getName();
- }
- return userName;
- }
-
- private String getCatalinaBase() {
- String path = getServletContext().getRealPath("/");
- logger.fine("getRealPath: " + path); // file-cms in webapps
- File file = new File(path);
- file = file.getParentFile().getParentFile();
- return file.getAbsolutePath();
- }
}
\ No newline at end of file
--
Gitblit v1.9.3