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 | 135 +++++++++++++++++++++++++++++++-------------
1 files changed, 95 insertions(+), 40 deletions(-)
diff --git a/src/de/uhilger/avdirektor/handler/PlayHandler.java b/src/de/uhilger/avdirektor/handler/PlayHandler.java
index 7cdb127..8f34c6d 100644
--- a/src/de/uhilger/avdirektor/handler/PlayHandler.java
+++ b/src/de/uhilger/avdirektor/handler/PlayHandler.java
@@ -1,60 +1,115 @@
+/*
+ AV-Direktor - Control OMXPlayer on Raspberry Pi via HTTP
+ Copyright (C) 2021 Ulrich Hilger
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ 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 com.sun.net.httpserver.HttpHandler;
+import de.uhilger.avdirektor.App;
import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Map;
+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;
/**
- *
+ * 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)
+ *
+ * ?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 OMXPlayer implements HttpHandler {
-
+public class PlayHandler extends CmdHandler {
+
private static final Logger logger = Logger.getLogger(PlayHandler.class.getName());
- /*
- 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)
-
- ?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
+ public PlayHandler(String cmd) {
+ super(cmd);
+ }
- */
- @Override
- public void handle(HttpExchange t) throws IOException {
- logger.log(Level.FINE, "RequestURI: {0}", t.getRequestURI().toString());
-
- Map map = getQueryMap(t);
- StringBuilder params = new StringBuilder();
- params.append("-o ");
+ protected StringBuilder buildParams(HttpExchange t) {
+ StringBuilder params = super.buildParams(t);
+ params.append("-b -o ");
params.append(getParam(map, "o"));
params.append(" --threshold ");
params.append(getParam(map, "th"));
params.append(" --timeout ");
params.append(getParam(map, "ti"));
-
- String antwort = abspielenMitParameternUndRueckmeldung(
- getParam(map, "titel"), params.toString(), getParam(map, "r"), "1");
-
- String response = getResponseString(map, "play", antwort);
- t.sendResponseHeaders(200, response.length());
- OutputStream os = t.getResponseBody();
- os.write(response.getBytes());
- os.close();
+ String log = getParam(map, "log");
+ 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)) {
+ try {
+ //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");
+ 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