From a7f0a18275d394ff92e44fcce55a511a54535787 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Mon, 22 Mar 2021 11:57:53 +0000
Subject: [PATCH] Play/Stop erste fertige Fassung
---
src/de/uhilger/avdirektor/handler/PlayHandler.java | 60 ++++++++++++++++++++++++++++++++++--------------------------
1 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/src/de/uhilger/avdirektor/handler/PlayHandler.java b/src/de/uhilger/avdirektor/handler/PlayHandler.java
index 5ceda70..0806ed9 100644
--- a/src/de/uhilger/avdirektor/handler/PlayHandler.java
+++ b/src/de/uhilger/avdirektor/handler/PlayHandler.java
@@ -5,7 +5,9 @@
import java.io.IOException;
import java.io.OutputStream;
import java.util.HashMap;
+import java.util.Map;
import java.util.Set;
+import java.util.function.Consumer;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -50,39 +52,45 @@
private static final Logger logger = Logger.getLogger(PlayHandler.class.getName());
+ /*
+ rpi4-az:9090/avd/play?titel=/Filme/S/sound_city.m4v&to=60&ti=60&o=local
+
+ OMXPlayer.abspielenMitParameternUndRueckmeldung(
+ String urlStr, String parameter, String meldeUrlStr, String token)
+
+ Parameter des Aufrufs play als query
+
+ ?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
+
+ */
+
+
@Override
public void handle(HttpExchange t) throws IOException {
- logger.log(Level.INFO, "RequestURI.getPath: {0}", t.getRequestURI().getPath());
+ logger.log(Level.FINE, "RequestURI: {0}", t.getRequestURI().toString());
- String path = t.getRequestURI().getPath();
- String[] parts = path.split("/");
- for (String part : parts) {
- logger.log(Level.INFO, "part: {0}", part);
- }
- //logger.log(Level.INFO, "query: {0}", t.getRequestURI().getQuery());
-
- HashMap map = new HashMap();
- String query = t.getRequestURI().getQuery();
- if(query != null && query.length() > 0) {
- String qParts[] = query.split("&");
- for(String qPart : qParts) {
- //logger.info("qPart: " + qPart);
- String pParts[] = qPart.split("=");
- map.put(pParts[0], pParts[1]);
- }
- }
- Set keys = map.keySet();
- keys.forEach(key -> {
- logger.info("key " + key + " value " + map.get(key));
- });
+ Map map = getQueryMap(t);
+ StringBuilder params = new StringBuilder();
+ params.append("-o ");
+ params.append(getParam(map, "o"));
+ params.append(" --threshold ");
+ params.append(getParam(map, "th"));
+ params.append(" --timeout ");
+ params.append(getParam(map, "ti"));
-
- String response = "play";
+ 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();
-
}
-
}
--
Gitblit v1.9.3