From 5adf10229cbd122b2ac2981fdc6392324356945b Mon Sep 17 00:00:00 2001
From: ulrich
Date: Sun, 09 Jan 2022 14:32:52 +0000
Subject: [PATCH] Logging entfernt
---
src/de/uhilger/httpserver/cm/FileManager.java | 109 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 67 insertions(+), 42 deletions(-)
diff --git a/src/de/uhilger/httpserver/cm/FileManager.java b/src/de/uhilger/httpserver/cm/FileManager.java
index 19174a8..bef1009 100644
--- a/src/de/uhilger/httpserver/cm/FileManager.java
+++ b/src/de/uhilger/httpserver/cm/FileManager.java
@@ -105,9 +105,6 @@
*/
public class FileManager extends FileHandler implements ThreadListener {
- /* Der Logger fuer diesen ListFileHandler */
- private static final Logger logger = Logger.getLogger(FileManager.class.getName());
-
/*
private static final String[] specialChars = {new String("\u00c4"), new String("\u00d6"),
new String("\u00dc"), new String("\u00e4"), new String("\u00f6"), new String("\u00fc"), new String("\u00df")};
@@ -158,7 +155,7 @@
String userId = e.getPrincipal().getUsername();
if(auth.hasRole(userId, e.getHttpContext().getAttributes().get(ATTR_ROLE).toString())) {
String method = e.getRequestMethod();
- logger.fine("method: " + method);
+ //logger.fine("method: " + method);
HttpHelper helper = new HttpHelper();
switch (method) {
case HttpHelper.HTTP_GET:
@@ -187,7 +184,7 @@
if (query != null) {
String[] params = query.split("=");
for (String param : params) {
- logger.fine("param: " + param);
+ //logger.fine("param: " + param);
}
switch (params[0]) {
case P_COPY:
@@ -199,18 +196,18 @@
case P_DUPLICATE:
if(Boolean.parseBoolean(params[1])) {
String neuerDateiName = duplizieren(exchange, helper);
- logger.fine("neuer Name: " + neuerDateiName);
+ //logger.fine("neuer Name: " + neuerDateiName);
standardHeaderUndAntwort(exchange, SC_OK, neuerDateiName);
}
break;
case P_RENAME:
String neuerDateiName = umbenennen(exchange, helper, params[1]);
- logger.fine("neuer Name: " + neuerDateiName);
+ //logger.fine("neuer Name: " + neuerDateiName);
standardHeaderUndAntwort(exchange, SC_OK, neuerDateiName);
break;
case P_ZIP:
String path = exchange.getRequestURI().toString();
- logger.fine(path);
+ //logger.fine(path);
String antwort = packFolder(helper.getFileName(exchange), path, exchange);
if(antwort.equalsIgnoreCase("ok")) {
standardHeaderUndAntwort(exchange, SC_OK, antwort);
@@ -220,7 +217,7 @@
break;
case P_UNZIP:
path = exchange.getRequestURI().toString();
- logger.fine(path);
+ //logger.fine(path);
antwort = extractZipfile(helper.getFileName(exchange), path, exchange);
if(antwort.equalsIgnoreCase("ok")) {
standardHeaderUndAntwort(exchange, SC_OK, antwort);
@@ -233,15 +230,39 @@
speichern(exchange, helper);
}
}
+
+ public class DirList {
+ private String pfad;
+ private List<Datei> dateien;
+
+ public String getPfad() {
+ return pfad;
+ }
+
+ public void setPfad(String pfad) {
+ this.pfad = pfad;
+ }
+
+ public List<Datei> getDateien() {
+ return dateien;
+ }
+
+ public void setDateien(List<Datei> dateien) {
+ this.dateien = dateien;
+ }
+
+
+ }
private void liste(HttpExchange e, HttpHelper helper) throws IOException {
String path = e.getRequestURI().toString();
- logger.fine(path);
+ //logger.fine(path);
String fName = helper.getFileName(e);
+ String dirListPath = e.getHttpContext().getPath() + fName;
if (path.endsWith(STR_SLASH)) {
- logger.fine("fName: " + fName);
+ //logger.fine("fName: " + fName);
File dir = new File(e.getHttpContext().getAttributes().get(FileHandler.ATTR_FILE_BASE).toString(), fName);
- logger.fine("absPath: " + dir.getAbsolutePath());
+ //logger.fine("absPath: " + dir.getAbsolutePath());
File[] files = dir.listFiles(new ImageFileFilter());
if(files != null && files.length > 0) {
Arrays.sort(files);
@@ -255,7 +276,7 @@
} else {
datei.setTyp(Datei.TYP_DATEI);
}
- datei.setPfad(e.getHttpContext().getPath() + fName);
+ //datei.setPfad(e.getHttpContext().getPath() + fName);
String lowerName = dateiName.toLowerCase();
if (lowerName.endsWith(ImageActor.JPEG)
|| lowerName.endsWith(ImageActor.JPG)
@@ -276,8 +297,12 @@
}
}
if(liste.size() > 0) {
+ DirList list = new DirList();
+ list.setPfad(dirListPath);
+ list.setDateien(liste);
Gson gson = new Gson();
- String json = gson.toJson(liste);
+ //String json = gson.toJson(liste);
+ String json = gson.toJson(list);
//byte[] bytes = json.getBytes();
//logger.fine("json: '" + json + "'");
HttpResponder r = new HttpResponder();
@@ -295,7 +320,7 @@
String fromName = fName.replace(ImageActor.B64, "");
File fromFile = new File(e.getHttpContext().getAttributes().get(FileHandler.ATTR_FILE_BASE).toString(), fromName);
File toFile = new File(e.getHttpContext().getAttributes().get(FileHandler.ATTR_FILE_BASE).toString(), fName);
- logger.fine("from " + fromFile.getAbsolutePath() + ", to " + toFile.getAbsolutePath());
+ //logger.fine("from " + fromFile.getAbsolutePath() + ", to " + toFile.getAbsolutePath());
if(!toFile.exists()) {
actor.b64Image(fromFile, toFile);
}
@@ -359,20 +384,20 @@
private void emptyListResponse(HttpExchange e) throws IOException {
HttpResponder r = new HttpResponder();
String json = "{}";
- logger.log(Level.FINE, "json: ''{0}''", json);
+ //logger.log(Level.FINE, "json: ''{0}''", json);
r.antwortSenden(e, SC_OK, json);
}
private void speichern(HttpExchange exchange, HttpHelper helper) throws IOException {
String fileName = helper.getFileName(exchange);
- logger.info("fileName: " + fileName);
+ //logger.info("fileName: " + fileName);
// file ist die Datei, um die es geht
File file = new File(exchange.getHttpContext().getAttributes().get(FileHandler.ATTR_FILE_BASE).toString(), fileName);
String method = exchange.getRequestMethod();
if (fileName.endsWith(STR_SLASH)) {
- logger.info("neuer Ordner: " + file.getAbsolutePath());
+ //logger.info("neuer Ordner: " + file.getAbsolutePath());
// neuen Ordner erstellen oder ablehnen, wenn der Ordner schon existiert
if (method.equalsIgnoreCase(HttpHelper.HTTP_POST)) {
if (!file.exists()) {
@@ -387,7 +412,7 @@
standardHeaderUndAntwort(exchange, SC_METHOD_NOT_ALLOWED, antwort);
}
} else {
- logger.info("Datei speichern: " + file.getAbsolutePath());
+ //logger.info("Datei speichern: " + file.getAbsolutePath());
// Datei speichern
if (method.equalsIgnoreCase(HttpHelper.HTTP_POST)) {
if (file.exists()) {
@@ -419,9 +444,9 @@
// dekodieren
String content = sb.toString();
- logger.fine(content);
+ //logger.fine(content);
String decoded = URLDecoder.decode(content, UTF8);
- logger.fine(decoded);
+ //logger.fine(decoded);
// in Datei schreiben
byte[] bytes = decoded.getBytes();
@@ -438,7 +463,7 @@
}
private void copyOrMove(HttpExchange exchange, String quelle, String ziel, int op) throws IOException {
- logger.fine("quelle: " + quelle + ", ziel: " + ziel);
+ //logger.fine("quelle: " + quelle + ", ziel: " + ziel);
String[] dateiNamen = dateiliste(exchange);
copyOrMoveFiles(quelle, ziel, dateiNamen, op, exchange);
standardHeaderUndAntwort(exchange, SC_OK, "Dateien verarbeitet.");
@@ -450,9 +475,9 @@
File targetDir = new File(e.getHttpContext().getAttributes().get(FileHandler.ATTR_FILE_BASE).toString(), toPath);
for (String fileName : fileNames) {
File srcFile = new File(srcDir, fileName);
- logger.fine("srcFile: " + srcFile);
+ //logger.fine("srcFile: " + srcFile);
if (srcFile.isDirectory()) {
- logger.fine("srcFile is directory.");
+ //logger.fine("srcFile is directory.");
OrdnerBearbeiter bearbeiter = new OrdnerBearbeiter();
bearbeiter.setTargetDir(targetDir.toPath());
bearbeiter.setOperation(operation);
@@ -490,7 +515,7 @@
private String[] dateiliste(HttpExchange exchange) throws IOException {
String body = new HttpHelper().bodyLesen(exchange);
- logger.fine("dateien: " + body);
+ //logger.fine("dateien: " + body);
Gson gson = new Gson();
return gson.fromJson(body, String[].class);
}
@@ -534,19 +559,19 @@
int newdotpos = newName.lastIndexOf(STR_DOT);
String newfname = newName.substring(0, newdotpos);
String newext = newName.substring(newdotpos);
- logger.fine("newfname: " + newfname + ", newext: " + newext);
+ //logger.fine("newfname: " + newfname + ", newext: " + newext);
String fnameext = targetFile.getName();
int dotpos = fnameext.lastIndexOf(STR_DOT);
String fname = fnameext.substring(0, dotpos);
String ext = fnameext.substring(dotpos);
- logger.fine("fname: " + fname + ", ext: " + ext);
+ //logger.fine("fname: " + fname + ", ext: " + ext);
DirectoryStream<Path> stream = Files.newDirectoryStream(targetDir.toPath(), fname + "*" + ext); //"*.{txt,doc,pdf,ppt}"
for (Path path : stream) {
- logger.fine(path.getFileName().toString());
+ //logger.fine(path.getFileName().toString());
alt = path.getFileName().toString();
- logger.fine("alt: " + alt);
+ //logger.fine("alt: " + alt);
if(alt.contains(ImageActor.TN)) {
neu = newfname + ImageActor.TN + newext;
} else if (alt.contains(ImageActor.KL)) {
@@ -571,13 +596,13 @@
private String deleteFiles(String relPath, List<String> fileNames, HttpExchange e) {
String result = null;
try {
- logger.fine(fileNames.toString());
+ //logger.fine(fileNames.toString());
if (!relPath.startsWith(STR_DOT)) {
File targetDir = new File(e.getHttpContext().getAttributes().get(FileHandler.ATTR_FILE_BASE).toString(), relPath); // getTargetDir(relPath);
- logger.fine("targetDir: " + targetDir);
+ //logger.fine("targetDir: " + targetDir);
for (String fileName : fileNames) {
File targetFile = new File(targetDir, fileName);
- logger.fine(targetFile.getAbsolutePath());
+ //logger.fine(targetFile.getAbsolutePath());
if (targetFile.isDirectory()) {
OrdnerBearbeiter bearbeiter = new OrdnerBearbeiter();
bearbeiter.setOperation(OP_DELETE);
@@ -601,7 +626,7 @@
result = "deleted";
}
} catch (Throwable ex) {
- logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
+ //logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
}
return result;
}
@@ -611,10 +636,10 @@
int dotpos = fnameext.lastIndexOf(STR_DOT);
String fname = fnameext.substring(0, dotpos);
String ext = fnameext.substring(dotpos);
- logger.fine("fname: " + fname + ", ext: " + ext);
+ //logger.fine("fname: " + fname + ", ext: " + ext);
DirectoryStream<Path> stream = Files.newDirectoryStream(targetDir.toPath(), fname + "*" + ext); //"*.{txt,doc,pdf,ppt}"
for (Path path : stream) {
- logger.fine(path.getFileName().toString());
+ //logger.fine(path.getFileName().toString());
Files.delete(path);
}
stream.close();
@@ -625,11 +650,11 @@
int dotpos = fnameext.lastIndexOf(STR_DOT);
String fname = fnameext.substring(0, dotpos);
String ext = fnameext.substring(dotpos);
- logger.fine("fname: " + fname + ", ext: " + ext);
+ //logger.fine("fname: " + fname + ", ext: " + ext);
Path targetPath = targetDir.toPath();
DirectoryStream<Path> stream = Files.newDirectoryStream(srcDir.toPath(), fname + "*" + ext); //"*.{txt,doc,pdf,ppt}"
for (Path path : stream) {
- logger.fine(path.getFileName().toString());
+ //logger.fine(path.getFileName().toString());
//Files.delete(path);
Files.move(path, targetPath.resolve(path.getFileName()));
}
@@ -645,7 +670,7 @@
/* --------- ZIP entpacken ---------------- */
public String extractZipfile(String fName, String relPath, HttpExchange e) {
- logger.fine("fName: " + fName + ", relPath: " + relPath);
+ //logger.fine("fName: " + fName + ", relPath: " + relPath);
String result = null;
if (!relPath.startsWith(".")) {
try {
@@ -659,7 +684,7 @@
}
} catch(Exception ex) {
result = ex.getLocalizedMessage();
- logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
+ //logger.log(Level.SEVERE, ex.getLocalizedMessage(), ex);
}
} else {
result = "Falsche relative Pfadangabe.";
@@ -731,11 +756,11 @@
if (!relPath.startsWith(".")) {
try {
//String fName = getFileName(e);
- logger.fine("fName: " + fName);
+ //logger.fine("fName: " + fName);
if (fName.endsWith(STR_SLASH)) {
File dir = new File(e.getHttpContext().getAttributes().get(FileHandler.ATTR_FILE_BASE).toString(), fName);
if(dir.isDirectory()) {
- logger.fine("absPath: " + dir.getAbsolutePath());
+ //logger.fine("absPath: " + dir.getAbsolutePath());
File parentDir = dir.getParentFile();
StringBuilder fname = new StringBuilder();
fname.append(dir.getName());
@@ -751,7 +776,7 @@
}
} catch(Exception ex) {
String result = ex.getLocalizedMessage();
- logger.log(Level.SEVERE, result, ex);
+ //logger.log(Level.SEVERE, result, ex);
return result;
}
} else {
--
Gitblit v1.9.3