From 332c058bd407c4b6fb30e6bf32b634a72bc68e05 Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Fri, 17 Jan 2020 16:31:42 +0000
Subject: [PATCH] Thumbnails werden nun im jeweiligen Bildordner mit abgelegt und nicht jedesmal 'on the fly' erzeugt.

---
 src/java/de/uhilger/filecms/api/FileMgr.java |  655 +++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 539 insertions(+), 116 deletions(-)

diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java
index 20277a1..d62cbb9 100644
--- a/src/java/de/uhilger/filecms/api/FileMgr.java
+++ b/src/java/de/uhilger/filecms/api/FileMgr.java
@@ -18,154 +18,362 @@
 
 package de.uhilger.filecms.api;
 
-import de.uhilger.filecms.web.Initialiser;
-import de.uhilger.filesystem.FileRef;
-import de.uhilger.filesystem.LocalFileSystem;
+import de.uhilger.filecms.data.FileRef;
+import de.uhilger.filecms.pub.AbstractComparator;
+import de.uhilger.filecms.pub.FileNameComparator;
+import de.uhilger.filecms.pub.ImgFileFilter;
+import de.uhilger.wbx.Bild;
+import de.uhilger.wbx.WbxUtils;
+import static de.uhilger.wbx.WbxUtils.EMPTY_STRING;
+import static de.uhilger.wbx.WbxUtils.WBX_FILE_BASE;
+import de.uhilger.wbx.data.Inhalt;
+import de.uhilger.wbx.web.TNServlet;
 import java.io.File;
+import java.io.FileFilter;
+import java.io.FileInputStream;
+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.Collections;
+import java.util.Comparator;
+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.Adler32;
+import java.util.zip.CheckedOutputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import net.coobird.thumbnailator.Thumbnails;
+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";
   
-  //private FileRef homeFolder;
-  //private FileRef publicFolder;
-  //private FileRef namedHomeFolder;
-  //private FileRef namedPublicFolder;
+  public static final int OP_COPY = 1;
+  public static final int OP_MOVE = 2;
   
-      
   public String hallo() {
     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) {
+    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) {
-      /*
-      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());
+    if (!relPath.startsWith(".") && !relPath.contains("WEB-INF") && !relPath.contains("META-INF")) {
+      if (relPath.length() == 0) {
+        FileRef namedPublicFolder = new FileRef(PUB_DIR_NAME, true);
+        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);
+          files.add(namedBaseFolder);
+          files.add(namedDataFolder);
+        }
       } else {
-        // kann eigentlich nicht sein..
+        String path = getTargetDir(relPath).getAbsolutePath();
+        logger.fine("listing path: " + path);
+        File dir = new File(path);
+        if (dir.exists()) {
+          File[] fileArray = dir.listFiles(new ImgFileFilter());
+          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:/", "");
+            if (fileArray[i].isDirectory()) {
+              fname = fname.substring(0, fname.length() - 1);
+            }
+            logger.fine(fname);
+            if(!fname.contains("WEB-INF") && !fname.contains("META-INF")) {
+              long fLen = fileArray[i].length();
+              long lastMod = fileArray[i].lastModified();
+              FileRef ref = new FileRef(fname, fileArray[i].isDirectory(), fileArray[i].isHidden(), lastMod, fLen);
+              ref.setMimetype(bild.getMimeType(fileArray[i]));
+              files.add(ref);
+            }
+          }
+        }
       }
-      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);
     }
-    
     return files;
   }
+
+  public List<Inhalt> collect(String relativePath, int maxTiefe, int maxAnzahl, int len) {
+    
+    WbxUtils wu = new WbxUtils();
+    HttpServletRequest req = getRequest();
+    String requestUrl = req.getRequestURL().toString();
+    String contextPath = req.getContextPath();
+    return wu.collectFiles(requestUrl, contextPath, relativePath, maxTiefe, maxAnzahl, len);
+  }
   
-  private File getTargetDir(String relPath) {
+  public FileRef newFolder(String relPath, String folderName) {
+    if (!relPath.startsWith(".")) {
       logger.finer(relPath);
       String targetPath = null;
       if(relPath.startsWith(PUB_DIR_NAME)) {
-        targetPath = PUB_DIR_PATH + getUserName() + "/" + relPath.substring(PUB_DIR_NAME.length());
+        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());
+        targetPath = HOME_DIR_PATH + getUserName() + "/" + relPath.substring(HOME_DIR_NAME.length()) + "/" + folderName;
       } else {
         // kann eigentlich nicht sein..
       }
       logger.finer(targetPath);
       File targetDir = new File(getBase().getAbsolutePath(), targetPath);
-      return targetDir;
+      targetDir.mkdirs();
+      return new FileRef(targetDir.getAbsolutePath(), true);
+    } else {
+      return null;
+    }
   }
   
-  private FileRef getBase() {
-    FileRef base = null;
-    Object o = getServletContext().getAttribute(Initialiser.FILE_BASE);
-    if(o instanceof FileRef) {
-      base = (FileRef) o;
+  public String getCode(String relPath, String fileName) {
+    String code = null;
+    if (!relPath.startsWith(".")) {
+      Object p = getRequest().getUserPrincipal();
+      if (p instanceof Principal) {
+        Reader reader = null;
+        try {
+          File targetFile = new File(getTargetDir(relPath), fileName);
+
+          //reader = new InputStreamReader(new FileInputStream(targetFile), "UTF8");
+          reader = new FileReader(targetFile);
+          StringBuffer buf = new StringBuffer();
+          char[] readBuffer = new char[1024];
+          int charsRead = reader.read(readBuffer);
+          while (charsRead > -1) {
+            buf.append(readBuffer, 0, charsRead);
+            charsRead = reader.read(readBuffer);
+          }
+          code = buf.toString();
+        } catch (FileNotFoundException ex) {
+          Logger.getLogger(FileMgr.class.getName()).log(Level.SEVERE, null, ex);
+        } catch (IOException ex) {
+          Logger.getLogger(FileMgr.class.getName()).log(Level.SEVERE, null, ex);
+        } finally {
+          try {
+            reader.close();
+          } catch (IOException ex) {
+            Logger.getLogger(FileMgr.class.getName()).log(Level.SEVERE, null, ex);
+          }
+        }
+
+      }
     }
-    return base;
+    return code;
   }
   
-  /*
-  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());
+  public String renameFile(String relPath, String fname, String newName) {
+    if (!relPath.startsWith(".")) {
+      File targetDir = getTargetDir(relPath);
+      File file = new File(targetDir, fname);
+      file.renameTo(new File(targetDir, newName));
+      return fname + " umbenannt zu " + newName;
+    } else {
+      return "Pfad nicht erlaubt.";
     }
-    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());
+  public String deleteFiles(String relPath, List fileNames) {
+    String result = null;
+    try {
+      logger.fine(fileNames.toString());
+      if (!relPath.startsWith(".")) {
+        File targetDir = getTargetDir(relPath);
+        for(int i=0; i < fileNames.size(); i++) {
+          Object o = fileNames.get(i);
+          if(o instanceof ArrayList) {
+            ArrayList al = (ArrayList) o;
+            logger.fine(al.get(0).toString());
+            File targetFile = new File(targetDir, al.get(0).toString());
+            logger.fine(targetFile.getAbsolutePath());
+            if(targetFile.isDirectory()) {
+              FileUtils.deleteDirectory(targetFile);
+            } else {
+              targetFile.delete();
+            }
+          }
+        }
+        result = "deleted";
+      }
+    } catch (Throwable ex) {
+      logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
     }
-    return userDir;
+    return result;
   }
-  */
+  
+  public String copyFiles(String fromPath, String toPath, List fileNames) {
+    return copyOrMoveFiles(fromPath, toPath, fileNames, OP_COPY);
+  }
+  
+  public String moveFiles(String fromPath, String toPath, List fileNames) {
+    return copyOrMoveFiles(fromPath, toPath, fileNames, OP_MOVE);
+  }
+  
+  private String copyOrMoveFiles(String fromPath, String toPath, List fileNames, int operation) {
+    String result = null;
+    try {
+      if (!fromPath.startsWith(".")) {
+        File srcDir = getTargetDir(fromPath);
+        File targetDir = getTargetDir(toPath);
+        Iterator i = fileNames.iterator();
+        while(i.hasNext()) {
+          Object o = i.next();
+          if (o instanceof ArrayList) {
+            ArrayList al = (ArrayList) o;
+            File srcFile = new File(srcDir, al.get(0).toString());
+            if(srcFile.isDirectory()) {
+              if(operation == OP_MOVE) {
+                FileUtils.moveDirectoryToDirectory(srcFile, targetDir, false);
+              } else {
+                FileUtils.copyDirectoryToDirectory(srcFile, targetDir);
+              }
+            } else {
+              if(operation == OP_MOVE) {
+                FileUtils.moveFileToDirectory(srcFile, targetDir, false);
+              } else {
+                FileUtils.copyFileToDirectory(srcFile, targetDir);              
+              }
+            }
+          }
+        }
+      }
+    } catch (IOException ex) {
+      logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
+    }
+    return result;
+  }
+  
+  public FileRef saveTextFileAs(String relPath, String fileName, String contents) {
+    FileRef savedFile = null;
+    logger.fine(relPath + " " + fileName);
+    if (!relPath.startsWith(".")) {
+      //FileRef datenRef = getBase();
+      Object p = getRequest().getUserPrincipal();
+      if(p instanceof Principal) {
+        File targetFile = new File(getTargetDir(relPath), fileName);
+        if(targetFile.exists()) {
+          targetFile = getNewFileName(targetFile);
+        } else {
+          targetFile.getParentFile().mkdirs();
+        }
+        saveToFile(targetFile, contents);
+      }
+    }
+    return savedFile;
+  }
+  
+  private File getNewFileName(File file) {
+    File dir = file.getParentFile();
+    String targetName = file.getName();
+    logger.fine("targetName: " + targetName);
+    String ext = "";
+    int dotpos = targetName.indexOf(".");
+    if(dotpos > -1) {
+      ext = targetName.substring(dotpos);
+      targetName = targetName.substring(0, dotpos);
+    }
+    logger.fine("targetName: " + targetName + ", ext: " + ext);
+    int i = 1;
+    while(file.exists()) {
+      StringBuffer buf = new StringBuffer();
+      buf.append(targetName);
+      buf.append("-");
+      buf.append(i);
+      if(ext.length() > 0) {
+        buf.append(ext);
+      }
+      file = new File(dir, buf.toString());
+      i++;
+    }
+    logger.fine("new file: " + file.getName());
+    return file;
+  }  
+  
+  private FileRef saveToFile(File targetFile, String contents) {
+    FileRef savedFile = null;
+    try {
+      targetFile.createNewFile();
+      FileWriter w = new FileWriter(targetFile);
+      //w.write(StringEscapeUtils.unescapeHtml(contents));
+      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, ex.getLocalizedMessage(), ex);
+    }
+    return savedFile;
+  }
   
   public FileRef saveTextFile(String relPath, String fileName, String contents) {
     FileRef savedFile = null;
-    try {
-      FileRef datenRef = getBase();
-      File daten = new File(datenRef.getAbsolutePath());
+    logger.fine(relPath + " " + fileName);
+    if (!relPath.startsWith(".")) {    
+      //FileRef datenRef = getBase();
       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(getTargetDir(relPath), fileName);
         if(targetFile.exists()) {
           /*
@@ -178,29 +386,244 @@
         } 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());
+        saveToFile(targetFile, contents);
       }
-    } catch (IOException ex) {
-      logger.log(Level.SEVERE, null, ex);
     }
     return savedFile;
   }
   
-  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())));
+  public String bildVerkleinern(String relPath, String bildName) {
+    if (!relPath.startsWith(".")) {
+      File dir = getTargetDir(relPath);
+      File original = new File(dir, bildName);
+      Bild bild = new Bild();
+      //for (int i = 0; i < Bild.GR.length; i++) {
+
+      //int gr = bild.getVariantenGroesse(i);
+      String ext = "";
+      String nurname = bildName;
+      int dotpos = bildName.indexOf(".");
+      if (dotpos > -1) {
+        ext = bildName.substring(dotpos);
+        nurname = bildName.substring(0, dotpos);
+      }
+
+          // 120, 240, 500, 700, 1200
+
+      
+      for (int i = 0; i < Bild.GR.length; i++) {
+        StringBuffer buf = new StringBuffer();
+        buf.append(nurname);
+        buf.append(bild.getVariantenName(i));
+        buf.append(ext);
+        File newImgFile = new File(dir, buf.toString());
+        try {
+          Thumbnails.of(original)
+                  .size(bild.getVariantenGroesse(i), bild.getVariantenGroesse(i))
+                  .keepAspectRatio(true)
+                  .outputQuality(0.7)
+                  .toFile(newImgFile);
+        } catch (IOException ex) {
+          logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
+        }
+      }
+      return "ok";
+    } else {
+      return "Pfad micht erlaubt.";
+    }
   }
-    
-}
+  
+  public String bildRotieren(String relPath, String bildName) {
+    if (!relPath.startsWith(".")) {
+      File dir = getTargetDir(relPath);
+      File original = new File(dir, bildName);
+
+      String ext = "";
+      String nurname = bildName;
+      int dotpos = bildName.indexOf(".");
+      if (dotpos > -1) {
+        ext = bildName.substring(dotpos);
+        nurname = bildName.substring(0, dotpos);
+      }
+
+      StringBuffer buf = new StringBuffer();
+      buf.append(nurname);
+      buf.append("-rot");
+      buf.append(ext);
+      File newImgFile = new File(dir, buf.toString());
+      
+      logger.fine("original: " + original.getAbsolutePath() + " newImgFile: " + newImgFile.getAbsolutePath());
+
+      try {
+        Thumbnails.of(original)
+                .scale(1)
+                .rotate(90)
+                .toFile(newImgFile);
+      } catch (IOException ex) {
+        logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
+      }
+
+
+      return "ok";
+    } else {
+      return "Pfad micht erlaubt.";
+    }
+  }
+  
+  /* --------- ZIP entpacken ---------------- */
+  
+  public String extractZipfile(String relPath, String filename) {
+    String result = null;
+    if (!relPath.startsWith(".")) {    
+      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();
+		}
+	}
+
+  /* ------------- Ornder als ZIP packen --------------- */
+  
+  public String packFolder(String relPath) {
+    if (!relPath.startsWith(".")) {    
+      try {
+        File targetDir = getTargetDir(relPath);
+        File parentDir = targetDir.getParentFile();
+        StringBuffer fname = new StringBuffer();
+        fname.append(targetDir.getName());
+        fname.append(".zip");
+        File archiveFile = new File(parentDir, fname.toString());
+        FileRef folderToPack = new FileRef(targetDir.getAbsolutePath());
+        FileRef archive = new FileRef(archiveFile.getAbsolutePath());
+        pack(folderToPack, archive);
+        return "ok";
+      } catch(Exception ex) {
+        String result = ex.getLocalizedMessage();
+        logger.log(Level.SEVERE, result, ex);
+        return result;
+      }
+    } else {
+      return "Falsche relative Pfadangabe";
+    }
+  }
+  
+	/**
+	 * pack the contents of a given folder into a new ZIP compressed archive
+	 * @param folder  the folder to pack
+	 * @param archive  the archive to create from the given files
+	 * @throws Exception
+	 */
+	private boolean pack(FileRef folder, FileRef archive) throws Exception {
+		File file = new File(archive.getAbsolutePath());
+		FileOutputStream fos = new FileOutputStream(file);
+		CheckedOutputStream checksum = new CheckedOutputStream(fos, new Adler32());
+		ZipOutputStream zos = new ZipOutputStream(checksum);
+		pack(zos, folder.getAbsolutePath(), "");
+		zos.flush();
+		zos.finish();
+		zos.close();
+		fos.flush();
+		fos.close();
+		return true;
+	}
+
+	/**
+	 * go through the given file structure recursively
+	 * @param zipFile  the ZIP file to write to
+	 * @param srcDir  the directory to pack during this cycle
+	 * @param subDir  the subdirectory to append to names of file entries inside the archive
+	 * @throws IOException
+	 */
+	private void pack(ZipOutputStream zipFile, String srcDir, String subDir) throws IOException {
+		File[] files = new File(srcDir).listFiles();
+		for(int i = 0; i < files.length; i++) {
+			if(files[i].isDirectory()) {
+				pack(zipFile, files[i].getAbsolutePath(), subDir + File.separator + files[i].getName());
+			}
+			else {
+				packFile(zipFile, subDir, files[i]);
+			}
+		}
+	}
+
+	/**
+	 * pack a given file
+	 * @param zipFile  the ZIP archive to pack to
+	 * @param dir  the directory name to append to name of file entry inside archive
+	 * @param file  the file to pack
+	 * @throws IOException
+	 */
+	private void packFile(ZipOutputStream zipFile, String dir, File file) throws IOException
+	{
+		FileInputStream fileinputstream = new FileInputStream(file);
+		byte buf[] = new byte[fileinputstream.available()];
+		fileinputstream.read(buf);
+		String dirWithSlashes = dir.replace('\\', '/');
+		//System.out.println("zipping " + dirWithSlashes + "/" + file.getName());
+		ZipEntry ze = new ZipEntry(dirWithSlashes + "/" + file.getName());
+		ze.setMethod(ZipEntry.DEFLATED);
+		zipFile.putNextEntry(ze);
+		zipFile.write(buf, 0, buf.length);
+		zipFile.closeEntry();
+		fileinputstream.close();
+	}
+
+  
+
+  /* ---- Hilfsfunktionen ---- */
+  
+}
\ No newline at end of file

--
Gitblit v1.9.3