From 0ac2623eb41c24c65f294ee610b66ac6af7d18dd Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Mon, 13 Mar 2017 16:39:30 +0000
Subject: [PATCH] Compile-Versuch (erfolgreich)

---
 src/java/de/uhilger/filecms/api/FileMgr.java |   65 ++++++++++++++++++++++++++++++--
 1 files changed, 61 insertions(+), 4 deletions(-)

diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java
index 183c5ff..73b7c0b 100644
--- a/src/java/de/uhilger/filecms/api/FileMgr.java
+++ b/src/java/de/uhilger/filecms/api/FileMgr.java
@@ -20,11 +20,17 @@
 
 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.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.Reader;
 import java.security.Principal;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -43,7 +49,8 @@
   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 = "Persoenlicher Ordner";
+  public static final String HOME_DIR_NAME = "Persoenlich";
   
   public static final int OP_COPY = 1;
   public static final int OP_MOVE = 2;
@@ -53,6 +60,7 @@
   }
   
   public List<FileRef> list(String relPath) {
+    Bild bild = new Bild();
     List<FileRef> files = new ArrayList();
     if(relPath.length() == 0) {
       FileRef namedPublicFolder = new FileRef(PUB_DIR_NAME, true);
@@ -75,7 +83,9 @@
             fname = fname.substring(0, fname.length() - 1);
           }
           logger.fine(fname);
-          files.add(new FileRef(fname, fileArray[i].isDirectory()));
+          FileRef ref = new FileRef(fname, fileArray[i].isDirectory());
+          ref.setMimetype(bild.getMimeType(fileArray[i]));
+          files.add(ref);
         }
       }
     }    
@@ -103,9 +113,12 @@
     
     Object p = getRequest().getUserPrincipal();
     if(p instanceof Principal) {
-      FileReader reader = null;
+      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];
@@ -247,13 +260,14 @@
     }
     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();
@@ -291,7 +305,50 @@
     }
     return savedFile;
   }
+  
+  public String bildVerkleinern(String relPath, String bildName) {
+    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);
+      }
+        
+      Image image = Toolkit.getDefaultToolkit().getImage(original.getAbsolutePath());
+      MediaTracker mediaTracker = new MediaTracker(new Container());
+      mediaTracker.addImage(image, 0);
+      try {
+        mediaTracker.waitForID(0);
+
+        if(!mediaTracker.isErrorAny()) {
+          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());
+            if(!newImgFile.exists()) {
+              logger.fine(original.getAbsolutePath() + " " + newImgFile.getAbsolutePath());
+              bild.writeImageFile(image, bild.getVariantenGroesse(i), bild.getMimeType(original), newImgFile.getAbsolutePath());
+              //bild.writeImageFile(image, photo.getVariantenGroesse(i), photo.getMimetype(), photo.getAbsolutePath(basisPfad), photo.getVariantenName(basisPfad, i));
+            }
+          }
+        }
+      } catch(IOException | InterruptedException ex) {
+        logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
+      }
+
+    return "ok";
+  }
+
   /* ---- Hilfsfunktionen ---- */
   
   private File getTargetDir(String relPath) {

--
Gitblit v1.9.3