From 438b168cad54853a8b419e6c19e639b6d2f70bc0 Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Wed, 08 Mar 2017 06:42:10 +0000
Subject: [PATCH] Bild verkleinern (in Arbeit)
---
src/java/de/uhilger/filecms/api/FileMgr.java | 296 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 184 insertions(+), 112 deletions(-)
diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java
index 6359213..3e1073c 100644
--- a/src/java/de/uhilger/filecms/api/FileMgr.java
+++ b/src/java/de/uhilger/filecms/api/FileMgr.java
@@ -18,20 +18,26 @@
package de.uhilger.filecms.api;
+import de.uhilger.filecms.data.FileRef;
import de.uhilger.filecms.web.Initialiser;
-import de.uhilger.filesystem.FileRef;
-import de.uhilger.filesystem.FileSystem;
-import de.uhilger.filesystem.LocalFileSystem;
+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;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.apache.commons.io.FileUtils;
/**
*
@@ -64,13 +70,19 @@
files.add(namedPublicFolder);
} else {
String path = getTargetDir(relPath).getAbsolutePath();
- logger.fine("path: " + path);
- LocalFileSystem fs = new LocalFileSystem();
- logger.fine("listing " + getTargetDir(relPath).getAbsolutePath());
- FileRef[] fileRefs = fs.list(new FileRef(getTargetDir(relPath).getAbsolutePath(), true));
- for(int i = 0; i < fileRefs.length; i++) {
- files.add(fileRefs[i]);
- logger.fine("added " + fileRefs[i].getAbsolutePath());
+ logger.fine("listing path: " + path);
+ File dir = new File(path);
+ if(dir.exists()) {
+ File[] fileArray = dir.listFiles();
+ 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);
+ files.add(new FileRef(fname, fileArray[i].isDirectory()));
+ }
}
}
return files;
@@ -97,9 +109,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];
@@ -126,10 +141,16 @@
return code;
}
+ public String renameFile(String relPath, String fname, String newName) {
+ File targetDir = getTargetDir(relPath);
+ File file = new File(targetDir, fname);
+ file.renameTo(new File(targetDir, newName));
+ return fname + " umbenannt zu " + newName;
+ }
+
public String deleteFiles(String relPath, List fileNames) {
String result = null;
try {
- FileRef[] delRefs = new FileRef[fileNames.size()];
logger.fine(fileNames.toString());
File targetDir = getTargetDir(relPath);
for(int i=0; i < fileNames.size(); i++) {
@@ -139,11 +160,13 @@
logger.fine(al.get(0).toString());
File targetFile = new File(targetDir, al.get(0).toString());
logger.fine(targetFile.getAbsolutePath());
- delRefs[i] = new FileRef(targetFile.getAbsolutePath(), targetFile.isDirectory());
+ if(targetFile.isDirectory()) {
+ FileUtils.deleteDirectory(targetFile);
+ } else {
+ targetFile.delete();
+ }
}
}
- FileSystem fs = new LocalFileSystem();
- fs.delete(delRefs);
result = "deleted";
} catch (Throwable ex) {
logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
@@ -159,85 +182,169 @@
return copyOrMoveFiles(fromPath, toPath, fileNames, OP_MOVE);
}
- /**
- * Dateien kopieren
- *
- * @param fromPath der relative Pfad, aus dem die Dateien stammen, die kopiert werden sollen
- * @param toPath der relative Pfad, an den die Dateien kopiert werden sollen
- * @param fileNames Liste mit Namen der Dateien, die kopiert werden sollen
- * @param operation OP_COPY oder OP_MOVE
- * @return null bei Fehler oder Quittungstext, wenn erfolgreich
- */
private String copyOrMoveFiles(String fromPath, String toPath, List fileNames, int operation) {
String result = null;
try {
- FileRef[] files = new FileRef[fileNames.size()];
- logger.fine(fileNames.toString());
File srcDir = getTargetDir(fromPath);
- for(int i=0; i < fileNames.size(); i++) {
- Object o = fileNames.get(i);
- if(o instanceof ArrayList) {
+ File targetDir = getTargetDir(toPath);
+ Iterator i = fileNames.iterator();
+ while(i.hasNext()) {
+ Object o = i.next();
+ if (o instanceof ArrayList) {
ArrayList al = (ArrayList) o;
- logger.fine(al.get(0).toString());
File srcFile = new File(srcDir, al.get(0).toString());
- logger.fine(srcFile.getAbsolutePath());
- files[i] = new FileRef(srcFile.getAbsolutePath(), srcFile.isDirectory());
+ 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);
+ }
+ }
}
}
- File targetDir = getTargetDir(toPath);
- FileSystem fs = new LocalFileSystem();
- switch(operation) {
- case OP_COPY:
- fs.copy(files, new FileRef(targetDir.getAbsolutePath(), true));
- break;
- case OP_MOVE:
- fs.move(files, new FileRef(targetDir.getAbsolutePath(), true));
- break;
- }
- result = "kopiert";
- } catch (Throwable ex) {
+ } catch (IOException ex) {
logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
}
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();
- //File daten = new File(datenRef.getAbsolutePath());
- 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;
}
+
+ 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;
+ 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()) {
+ /*
+ 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 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), original.getAbsolutePath(), 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) {
@@ -274,40 +381,5 @@
userName = ((Principal) p).getName();
}
return userName;
- }
-
- /*
- 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())));
- }
- */
-
-}
-
-
-/*
- https://stackoverflow.com/questions/300559/move-copy-file-operations-in-java
-
-
-
-Try to use org.apache.commons.io.FileUtils (General file manipulation utilities). Facilities are provided in the following methods:
-
- (1) FileUtils.moveDirectory(File srcDir, File destDir) => Moves a directory.
-
- (2) FileUtils.moveDirectoryToDirectory(File src, File destDir, boolean createDestDir) => Moves a directory to another directory.
-
- (3) FileUtils.moveFile(File srcFile, File destFile) => Moves a file.
-
- (4) FileUtils.moveFileToDirectory(File srcFile, File destDir, boolean createDestDir) => Moves a file to a directory.
-
- (5) FileUtils.moveToDirectory(File src, File destDir, boolean createDestDir) => Moves a file or directory to the destination directory.
-
-It's simple, easy and fast.
-
-
- https://commons.apache.org/proper/commons-io/javadocs/api-2.5/org/apache/commons/io/FileUtils.html
-
-*/
\ No newline at end of file
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3