From 72e43ddf5a01b28d57a41bdbd4b77a0519d92912 Mon Sep 17 00:00:00 2001
From: ulrich <not disclosed>
Date: Sun, 19 Mar 2017 16:27:57 +0000
Subject: [PATCH] compileAll (Entwurf)
---
src/java/de/uhilger/filecms/api/FileMgr.java | 220 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 152 insertions(+), 68 deletions(-)
diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java
index 649357d..c2e2f8e 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;
@@ -40,10 +46,6 @@
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 int OP_COPY = 1;
public static final int OP_MOVE = 2;
@@ -52,7 +54,18 @@
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();
if(relPath.length() == 0) {
FileRef namedPublicFolder = new FileRef(PUB_DIR_NAME, true);
@@ -61,7 +74,13 @@
logger.finer(namedHomeFolder.getAbsolutePath());
files = new ArrayList();
files.add(namedHomeFolder);
- files.add(namedPublicFolder);
+ 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);
@@ -75,7 +94,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 +124,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];
@@ -205,77 +229,137 @@
return result;
}
- public FileRef saveTextFile(String relPath, String fileName, String contents) {
+ public FileRef saveTextFileAs(String relPath, String fileName, String contents) {
FileRef savedFile = null;
- try {
- FileRef datenRef = getBase();
- Object p = getRequest().getUserPrincipal();
- if(p instanceof Principal) {
- File targetFile = new File(getTargetDir(relPath), fileName);
- if(targetFile.exists()) {
- /*
- muss delete() sein?
- pruefen: ueberschreibt der FileWriter den alteen Inhalt oder
- entsteht eine unerwuenschte Mischung aus altem und neuem
- Inhalt?
- */
- targetFile.delete();
- } 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());
+ logger.fine(relPath + " " + fileName);
+ //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();
}
- } catch (IOException ex) {
- logger.log(Level.SEVERE, null, ex);
+ saveToFile(targetFile, contents);
}
return savedFile;
}
-
- /* ---- Hilfsfunktionen ---- */
- private File getTargetDir(String relPath) {
- logger.fine(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());
- } else {
- // kann eigentlich nicht sein..
+ 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(targetPath);
- File targetDir = new File(getBase().getAbsolutePath(), targetPath);
- return targetDir;
+ 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;
}
- 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;
+ public FileRef saveTextFile(String relPath, String fileName, String contents) {
+ FileRef savedFile = null;
+ logger.fine(relPath + " " + fileName);
+ //FileRef datenRef = getBase();
Object p = getRequest().getUserPrincipal();
if(p instanceof Principal) {
- userName = ((Principal) p).getName();
+ File targetFile = new File(getTargetDir(relPath), fileName);
+ if(targetFile.exists()) {
+ /*
+ muss delete() sein?
+ pruefen: ueberschreibt der FileWriter den alteen Inhalt oder
+ entsteht eine unerwuenschte Mischung aus altem und neuem
+ Inhalt?
+ */
+ targetFile.delete();
+ } else {
+ targetFile.getParentFile().mkdirs();
+ }
+ saveToFile(targetFile, contents);
}
- return userName;
- }
+ 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 ---- */
+
}
\ No newline at end of file
--
Gitblit v1.9.3