From c79727e6e2f717e44d2b8d5a60825db8ed6e5d66 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Mon, 18 Jan 2021 17:16:28 +0000
Subject: [PATCH] Encoding bei POST
---
src/java/de/uhilger/filecms/api/FileMgr.java | 123 +++++++++++++++++++++++++++++++++++++---
1 files changed, 112 insertions(+), 11 deletions(-)
diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java
index f96d2f0..3d6844f 100644
--- a/src/java/de/uhilger/filecms/api/FileMgr.java
+++ b/src/java/de/uhilger/filecms/api/FileMgr.java
@@ -21,12 +21,15 @@
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;
@@ -34,7 +37,15 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
import java.io.Reader;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.security.Principal;
import java.util.ArrayList;
import java.util.Arrays;
@@ -53,16 +64,19 @@
import javax.servlet.http.HttpServletRequest;
import net.coobird.thumbnailator.Thumbnails;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.filefilter.WildcardFileFilter;
+import org.apache.commons.lang.StringEscapeUtils;
/**
* Methoden zur Verwaltung von Dateien
*/
public class FileMgr extends Api {
private static final Logger logger = Logger.getLogger(FileMgr.class.getName());
-
-
+
public static final int OP_COPY = 1;
public static final int OP_MOVE = 2;
+
+ public static final String DOT = ".";
public String hallo() {
return "Hallo Welt!";
@@ -124,7 +138,7 @@
logger.fine("listing path: " + path);
File dir = new File(path);
if (dir.exists()) {
- File[] fileArray = dir.listFiles();
+ File[] fileArray = dir.listFiles(new ImgFileFilter());
if (orderBy != null && orderBy.equalsIgnoreCase("name")) {
Arrays.sort(fileArray, new FileNameComparator(order));
} else {
@@ -189,8 +203,8 @@
try {
File targetFile = new File(getTargetDir(relPath), fileName);
- //reader = new InputStreamReader(new FileInputStream(targetFile), "UTF8");
- reader = new FileReader(targetFile);
+ reader = new InputStreamReader(new FileInputStream(targetFile), Charset.forName("UTF-8").newDecoder());
+ //reader = new FileReader(targetFile);
StringBuffer buf = new StringBuffer();
char[] readBuffer = new char[1024];
int charsRead = reader.read(readBuffer);
@@ -220,18 +234,60 @@
if (!relPath.startsWith(".")) {
File targetDir = getTargetDir(relPath);
File file = new File(targetDir, fname);
- file.renameTo(new File(targetDir, newName));
+ if(fname.endsWith(TNServlet.JPEG) || fname.endsWith(TNServlet.JPG) || fname.endsWith(TNServlet.PNG)) {
+ renameImgFiles(targetDir, file, newName);
+ } else {
+ file.renameTo(new File(targetDir, newName));
+ }
return fname + " umbenannt zu " + newName;
} else {
return "Pfad nicht erlaubt.";
}
}
+ public void renameImgFiles(File targetDir, File targetFile, String newName) {
+ String alt;
+ String neu;
+
+ int newdotpos = newName.lastIndexOf(DOT);
+ String newfname = newName.substring(0, newdotpos);
+ String newext = newName.substring(newdotpos);
+ logger.fine("newfname: " + newfname + ", newext: " + newext);
+
+ String fnameext = targetFile.getName();
+ int dotpos = fnameext.lastIndexOf(DOT);
+ String fname = fnameext.substring(0, dotpos);
+ String ext = fnameext.substring(dotpos);
+ logger.fine("fname: " + fname + ", ext: " + ext);
+
+ FileFilter fileFilter = new WildcardFileFilter(fname + "*" + ext);
+ File[] files = targetDir.listFiles(fileFilter);
+ for (int i = 0; i < files.length; i++) {
+ alt = files[i].getName();
+ logger.fine("alt: " + alt);
+ if(alt.contains(TNServlet.TN)) {
+ neu = newfname + TNServlet.TN + newext;
+ } else if (alt.contains(TNServlet.KL)) {
+ neu = newfname + TNServlet.KL + newext;
+ } else if(alt.contains(TNServlet.GR)) {
+ neu = newfname + TNServlet.GR + newext;
+ } else if(alt.contains(TNServlet.MT)) {
+ neu = newfname + TNServlet.MT + newext;
+ } else if(alt.contains(TNServlet.SM)) {
+ neu = newfname + TNServlet.SM + newext;
+ } else {
+ neu = newName;
+ }
+ files[i].renameTo(new File(targetDir, neu));
+ logger.fine("neu: " + neu);
+ }
+ }
+
public String deleteFiles(String relPath, List fileNames) {
String result = null;
try {
logger.fine(fileNames.toString());
- if (!relPath.startsWith(".")) {
+ if (!relPath.startsWith(DOT)) {
File targetDir = getTargetDir(relPath);
for(int i=0; i < fileNames.size(); i++) {
Object o = fileNames.get(i);
@@ -243,7 +299,17 @@
if(targetFile.isDirectory()) {
FileUtils.deleteDirectory(targetFile);
} else {
- targetFile.delete();
+ /*
+ Wenn targetFile mit jpg, jpeg oder png endet,
+ muss eine Unterfunktion eine Liste aller Dateien bilden,
+ die so heissen, also z.B. alle [Dateiname]*.jpg
+ */
+ String fname = targetFile.getName().toLowerCase();
+ if(fname.endsWith(TNServlet.JPEG) || fname.endsWith(TNServlet.JPG) || fname.endsWith(TNServlet.PNG)) {
+ deleteImgFiles(targetDir, targetFile);
+ } else {
+ targetFile.delete();
+ }
}
}
}
@@ -253,6 +319,20 @@
logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
}
return result;
+ }
+
+ public void deleteImgFiles(File targetDir, File targetFile) {
+ String fnameext = targetFile.getName();
+ int dotpos = fnameext.lastIndexOf(DOT);
+ String fname = fnameext.substring(0, dotpos);
+ String ext = fnameext.substring(dotpos);
+ logger.fine("fname: " + fname + ", ext: " + ext);
+ FileFilter fileFilter = new WildcardFileFilter(fname + "*" + ext);
+ File[] files = targetDir.listFiles(fileFilter);
+ for (int i = 0; i < files.length; i++) {
+ logger.fine(files[i].getName());
+ files[i].delete();
+ }
}
public String copyFiles(String fromPath, String toPath, List fileNames) {
@@ -283,7 +363,12 @@
}
} else {
if(operation == OP_MOVE) {
- FileUtils.moveFileToDirectory(srcFile, targetDir, false);
+ String fname = srcFile.getName().toLowerCase();
+ if(fname.endsWith(TNServlet.JPEG) || fname.endsWith(TNServlet.JPG) || fname.endsWith(TNServlet.PNG)) {
+ moveImgFilesToDirectory(srcFile, srcDir, targetDir, false);
+ } else {
+ FileUtils.moveFileToDirectory(srcFile, targetDir, false);
+ }
} else {
FileUtils.copyFileToDirectory(srcFile, targetDir);
}
@@ -295,6 +380,20 @@
logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
}
return result;
+ }
+
+ private void moveImgFilesToDirectory(File srcFile, File srcDir, File targetDir, boolean createDestDir) throws IOException {
+ String fnameext = srcFile.getName();
+ int dotpos = fnameext.lastIndexOf(DOT);
+ String fname = fnameext.substring(0, dotpos);
+ String ext = fnameext.substring(dotpos);
+ logger.fine("fname: " + fname + ", ext: " + ext);
+ FileFilter fileFilter = new WildcardFileFilter(fname + "*" + ext);
+ File[] files = srcDir.listFiles(fileFilter);
+ for (int i = 0; i < files.length; i++) {
+ logger.fine(files[i].getName());
+ FileUtils.moveFileToDirectory(files[i], targetDir, createDestDir);
+ }
}
public FileRef saveTextFileAs(String relPath, String fileName, String contents) {
@@ -347,9 +446,11 @@
FileRef savedFile = null;
try {
targetFile.createNewFile();
- FileWriter w = new FileWriter(targetFile);
+ //FileWriter w = new FileWriter(targetFile, Charset.forName("UTF-8"));
//w.write(StringEscapeUtils.unescapeHtml(contents));
- w.write(contents);
+ Writer w = new OutputStreamWriter(new FileOutputStream(targetFile), "UTF-8");
+ //w.write(contents);
+ w.write(StringEscapeUtils.unescapeHtml(contents));
w.flush();
w.close();
savedFile = new FileRef(
--
Gitblit v1.9.3