From 968b07dace8f64519eaf2455729d87b66678d958 Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Sat, 03 Mar 2018 17:57:21 +0000
Subject: [PATCH] Ordner dav als Austausch-Ort hinzugefuegt
---
src/java/de/uhilger/filecms/api/FileMgr.java | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 103 insertions(+), 4 deletions(-)
diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java
index c2e2f8e..7995ba0 100644
--- a/src/java/de/uhilger/filecms/api/FileMgr.java
+++ b/src/java/de/uhilger/filecms/api/FileMgr.java
@@ -18,30 +18,36 @@
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 de.uhilger.filecms.pub.AbstractComparator;
+import de.uhilger.filecms.pub.FileNameComparator;
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.Arrays;
+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());
@@ -65,6 +71,26 @@
* @return
*/
public List<FileRef> list(String relPath) {
+ return listInt(relPath, "name", AbstractComparator.ORDER_ASC);
+ }
+
+ public List<FileRef> listOrdered(String relPath, String orderBy, String order) {
+ return listInt(relPath, orderBy, order);
+ }
+
+ /**
+ * 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
+ * @param orderBy 'name'
+ * @param order AbstractComparator.ORDER_ASC oder AbstractComparator.ORDER_DESC
+ * @return
+ */
+ private List<FileRef> listInt(String relPath, String orderBy, String order) {
Bild bild = new Bild();
List<FileRef> files = new ArrayList();
if(relPath.length() == 0) {
@@ -72,9 +98,12 @@
logger.finer(namedPublicFolder.getAbsolutePath());
FileRef namedHomeFolder = new FileRef(HOME_DIR_NAME, true);
logger.finer(namedHomeFolder.getAbsolutePath());
+ FileRef namedDavFolder = new FileRef(DAV_DIR_NAME, true);
+ logger.finer(namedDavFolder.getAbsolutePath());
files = new ArrayList();
files.add(namedHomeFolder);
files.add(namedPublicFolder);
+ files.add(namedDavFolder);
if(getRequest().isUserInRole(WBX_ADMIN_ROLE)) {
FileRef namedBaseFolder = new FileRef(WBX_BASE, true);
FileRef namedDataFolder = new FileRef(WBX_DATA, true);
@@ -87,6 +116,11 @@
File dir = new File(path);
if(dir.exists()) {
File[] fileArray = dir.listFiles();
+ if(orderBy != null && orderBy.equalsIgnoreCase("name")) {
+ Arrays.sort(fileArray, new FileNameComparator(order));
+ } else {
+ Arrays.sort(fileArray, new FileNameComparator(AbstractComparator.ORDER_ASC));
+ }
for(int i = 0; i < fileArray.length; i++) {
logger.fine(fileArray[i].toURI().toString());
String fname = fileArray[i].toURI().toString().replace("file:/", "");
@@ -102,6 +136,7 @@
}
return files;
}
+
public FileRef newFolder(String relPath, String folderName) {
logger.finer(relPath);
@@ -359,6 +394,70 @@
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 ---- */
--
Gitblit v1.9.3