From 6ff352870ec1dfea573fb3e6de370f8020fe0d04 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Sun, 04 Apr 2021 08:38:03 +0000
Subject: [PATCH] Umgestellt auf nio.FileSystem
---
src/de/uhilger/avdirektor/handler/PlayHandler.java | 74 +++++++++++++++++++++++++-----------
1 files changed, 51 insertions(+), 23 deletions(-)
diff --git a/src/de/uhilger/avdirektor/handler/PlayHandler.java b/src/de/uhilger/avdirektor/handler/PlayHandler.java
index ce37932..8f34c6d 100644
--- a/src/de/uhilger/avdirektor/handler/PlayHandler.java
+++ b/src/de/uhilger/avdirektor/handler/PlayHandler.java
@@ -14,40 +14,41 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
-*/
-
+ */
package de.uhilger.avdirektor.handler;
import com.sun.net.httpserver.HttpExchange;
import de.uhilger.avdirektor.App;
-import java.io.File;
import java.io.IOException;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.commons.io.FileUtils;
/**
* Play
- *
+ *
* rpi4-az:9090/avd/play?titel=/Filme/S/sound_city.m4v&th=60&ti=60&o=local
- *
- * OMXPlayer.abspielenMitParameternUndRueckmeldung(
- * String urlStr, String parameter, String meldeUrlStr, String token)
*
- * Parameter des Aufrufs play als query (th threshold, ti timeout)
+ * OMXPlayer.abspielenMitParameternUndRueckmeldung( String urlStr, String
+ * parameter, String meldeUrlStr, String token)
*
- * ?titel=/Filme/S/sound_city.m4v
- * &ti=60
- * &th=60
- * &o=local|hdmi|both
- * &r=http://uhilger.de/mc/api/usw
+ * Parameter des Aufrufs play als query (th threshold, ti timeout)
*
- * r muss ganz wegbleiben, wenn keine Rueckmeldung gewuescht ist
- *
+ * ?titel=/Filme/S/sound_city.m4v &ti=60 &th=60 &o=local|hdmi|both
+ * &r=http://uhilger.de/mc/api/usw
+ *
+ * r muss ganz wegbleiben, wenn keine Rueckmeldung gewuescht ist
+ *
* @author ulrich
*/
public class PlayHandler extends CmdHandler {
-
+
private static final Logger logger = Logger.getLogger(PlayHandler.class.getName());
public PlayHandler(String cmd) {
@@ -63,25 +64,52 @@
params.append(" --timeout ");
params.append(getParam(map, "ti"));
String log = getParam(map, "log");
- if(log != null && log.equalsIgnoreCase("true")) {
+ if (log != null && log.equalsIgnoreCase("true")) {
params.append(" --genlog");
}
return params;
}
-
+
@Override
protected String process(HttpExchange t, String params) {
- if(cmd.equalsIgnoreCase(OMXPlayer.F_PLAY)) {
+ if (cmd.equalsIgnoreCase(OMXPlayer.F_PLAY)) {
try {
- FileUtils.deleteDirectory(new File(System.getProperty("omx.wd"), "omx-logs"));
+ //FileUtils.deleteDirectory(new File(System.getProperty("omx.wd"), "omx-logs"));
+ FileSystem fs = FileSystems.getDefault();
+ Path path = fs.getPath(System.getProperty("omx.wd"), "omx-logs");
+ deleteDirectory(path);
+ //Files.delete(path);
} catch (IOException ex) {
logger.log(Level.SEVERE, null, ex);
}
}
- String antwort = App.getPlayer().abspielen(
- getParam(map, "titel"), params, getParam(map, "r"), "1");
+ String antwort = App.getPlayer().abspielen(
+ getParam(map, "titel"), params, getParam(map, "r"), "1");
logger.log(Level.FINE, antwort);
return antwort;
}
+ protected void deleteDirectory(Path start) throws IOException {
+ Files.walkFileTree(start, new SimpleFileVisitor<Path>() {
+ @Override
+ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
+ throws IOException {
+ Files.delete(file);
+ return FileVisitResult.CONTINUE;
+ }
+
+ @Override
+ public FileVisitResult postVisitDirectory(Path dir, IOException e)
+ throws IOException {
+ if (e == null) {
+ Files.delete(dir);
+ return FileVisitResult.CONTINUE;
+ } else {
+ // directory iteration failed
+ throw e;
+ }
+ }
+ });
+ }
+
}
--
Gitblit v1.9.3