From 972e946a9836c2909a8318587beeb9bee6631573 Mon Sep 17 00:00:00 2001
From: ulrich <not disclosed>
Date: Wed, 15 Mar 2017 17:07:50 +0000
Subject: [PATCH] CATALINA_BASE_FOLDER (erste Versuche)
---
src/java/de/uhilger/filecms/api/FileMgr.java | 85 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 80 insertions(+), 5 deletions(-)
diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java
index cb4ca87..b4ece2e 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;
@@ -32,7 +38,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringEscapeUtils;
/**
*
@@ -44,7 +49,10 @@
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 String CATALINA_BASE_FOLDER = "base";
public static final int OP_COPY = 1;
public static final int OP_MOVE = 2;
@@ -54,15 +62,18 @@
}
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);
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);
} else {
String path = getTargetDir(relPath).getAbsolutePath();
logger.fine("listing path: " + path);
@@ -76,7 +87,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);
}
}
}
@@ -104,9 +117,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];
@@ -293,21 +309,72 @@
}
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) {
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);
+ //File targetDir = new File(getBase().getAbsolutePath(), targetPath);
return targetDir;
}
@@ -331,4 +398,12 @@
}
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