From b6a8f02169ecea91936e81c297e8ce0f1b2f107b Mon Sep 17 00:00:00 2001
From: ulrich
Date: Tue, 23 Mar 2021 16:35:55 +0000
Subject: [PATCH] ...
---
src/de/uhilger/avdirektor/handler/PlayHandler.java | 68 +++++++++++++++------------------
1 files changed, 31 insertions(+), 37 deletions(-)
diff --git a/src/de/uhilger/avdirektor/handler/PlayHandler.java b/src/de/uhilger/avdirektor/handler/PlayHandler.java
index 7cdb127..0ff501d 100644
--- a/src/de/uhilger/avdirektor/handler/PlayHandler.java
+++ b/src/de/uhilger/avdirektor/handler/PlayHandler.java
@@ -1,60 +1,54 @@
package de.uhilger.avdirektor.handler;
import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Map;
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 String process(HttpExchange t, String params) {
+ String antwort = abspielen(
+ getParam(map, "titel"), params, getParam(map, "r"), "1");
+ logger.log(Level.FINE, antwort);
+ return antwort;
+ }
+
+ 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();
+ return params;
}
-
}
--
Gitblit v1.9.3