From d64c87fd1796c343894338aba279c3aa672428dc Mon Sep 17 00:00:00 2001 From: ulrich Date: Wed, 20 Nov 2024 12:28:22 +0000 Subject: [PATCH] Dokumentation in Arbeit: Anpassung an FileEraser, FileList umbenannt --- src/de/uhilger/neon/fm/FileManipulator.java | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/de/uhilger/neon/fm/FileManipulator.java b/src/de/uhilger/neon/fm/FileManipulator.java index 5b4d3c5..d643b9a 100644 --- a/src/de/uhilger/neon/fm/FileManipulator.java +++ b/src/de/uhilger/neon/fm/FileManipulator.java @@ -20,7 +20,6 @@ import com.sun.net.httpserver.HttpExchange; import de.uhilger.neon.FileServer; import de.uhilger.neon.HttpResponder; -import de.uhilger.fm.Const; import de.uhilger.fm.Duplicator; import de.uhilger.fm.Mover; import de.uhilger.fm.Renamer; @@ -59,23 +58,23 @@ public void run(HttpExchange exchange) { try { - super.run(exchange); + init(exchange); String query = exchange.getRequestURI().getQuery(); if (query != null) { String[] params = query.split(FileServer.STR_EQUAL); switch (params[0]) { case P_RENAME: h.inspectFileName(params[1]); - String neuerDateiName = new Renamer().umbenennen(exchange, fileName, params[1], file); + String neuerDateiName = new Renamer().rename(/*fileName, */params[1], file); antwort(exchange, HttpResponder.SC_OK, neuerDateiName); break; case P_COPY: h.inspectFileName(params[1]); - copyOrMove(exchange, params[1], fileName, Const.OP_COPY); + copyOrMove(exchange, params[1], fileName, Mover.OP_COPY); break; case P_MOVE: h.inspectFileName(params[1]); - copyOrMove(exchange, params[1], fileName, Const.OP_MOVE); + copyOrMove(exchange, params[1], fileName, Mover.OP_MOVE); break; case P_DUPLICATE: if (Boolean.parseBoolean(params[1])) { @@ -85,12 +84,12 @@ } break; case P_ZIP: - String path = exchange.getRequestURI().toString(); - zipAntwort(exchange, new Deflator().packFolder(fileName, path, base)); + //String path = exchange.getRequestURI().toString(); + zipAntwort(exchange, new Deflator().packFolder(fileName, /*path, */base)); break; case P_UNZIP: - path = exchange.getRequestURI().toString(); - zipAntwort(exchange, new Inflator().extractZipfile(fileName, path, base)); + //String path = exchange.getRequestURI().toString(); + zipAntwort(exchange, new Inflator().extractZipfile(fileName, /*path,*/ base)); break; default: antwort(exchange, HttpResponder.SC_NOT_FOUND, "ungueltige Anfrage"); @@ -112,7 +111,12 @@ private void copyOrMove(HttpExchange exchange, String quelle, String ziel, int op) throws IOException { String[] dateiNamen = dateiliste(exchange); - new Mover().copyOrMoveFiles(quelle, ziel, dateiNamen, op, base); + if(op == Mover.OP_COPY) { + new Mover().copy(quelle, ziel, dateiNamen, base); + } else { + new Mover().move(quelle, ziel, dateiNamen, base); + } + //new Mover().copyOrMoveFiles(quelle, ziel, dateiNamen, op, base); antwort(exchange, HttpResponder.SC_OK, "Dateien verarbeitet."); } -- Gitblit v1.9.3