From d769f3445ed4779715b5c2570731b4bb73d8d2aa Mon Sep 17 00:00:00 2001
From: ulrich
Date: Tue, 20 Apr 2021 17:15:03 +0000
Subject: [PATCH] Geraete-Liste mit Status (in Arbeit)
---
src/de/uhilger/mediaz/api/StorageHandler.java | 83 +++++++++++++++++++++++++++++++++++++----
1 files changed, 74 insertions(+), 9 deletions(-)
diff --git a/src/de/uhilger/mediaz/api/StorageHandler.java b/src/de/uhilger/mediaz/api/StorageHandler.java
index e6521bc..5d8db1b 100644
--- a/src/de/uhilger/mediaz/api/StorageHandler.java
+++ b/src/de/uhilger/mediaz/api/StorageHandler.java
@@ -22,13 +22,36 @@
import de.uhilger.mediaz.App;
import static de.uhilger.mediaz.App.RB_EP_LISTE;
import de.uhilger.mediaz.Server;
-import static de.uhilger.mediaz.Server.RB_SLASH;
import de.uhilger.mediaz.store.FileStorage;
import de.uhilger.mediaz.entity.Entity;
+import de.uhilger.mediaz.entity.Geraet;
+import static de.uhilger.mediaz.store.FileStorage.ST_ABLAGEORT;
+import static de.uhilger.mediaz.store.FileStorage.ST_GERAET;
+import java.io.BufferedReader;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.Authenticator;
+import java.net.HttpURLConnection;
+import java.net.InetSocketAddress;
+import java.net.ProxySelector;
+import java.net.URI;
+import java.net.URL;
+import java.util.Iterator;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Version;
+import java.net.http.HttpClient.Redirect;
+import java.net.http.HttpClient.Builder;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.time.Duration;
+import java.util.ArrayList;
+
/**
* HttpHandler fuer die Verwaltung von Entitaeten der Mediazentrale
@@ -43,7 +66,7 @@
@Override
protected String put(HttpExchange e) throws IOException {
String path = e.getRequestURI().toString();
- String[] elems = path.split(App.getRs(Server.RB_SLASH));
+ String[] elems = path.split(Server.SLASH);
String type = elems[elems.length - 2];
String elemName = elems[elems.length - 1]; // alter Name, wenn Aenderung
if(!elemName.equalsIgnoreCase(App.getRs(RB_EP_LISTE))) {
@@ -59,7 +82,7 @@
} else {
fs.write(entity, false);
}
- return type + App.getRs(Server.RB_SLASH) + entity.getName();
+ return type + Server.SLASH + entity.getName();
} else {
return "Ungueltiges Objekt im Body.";
}
@@ -70,23 +93,60 @@
private boolean loeschen(HttpExchange e) {
String path = e.getRequestURI().toString();
- String[] elems = path.split(App.getRs(Server.RB_SLASH));
+ String[] elems = path.split(Server.SLASH);
String type = elems[elems.length - 2];
String elemName = elems[elems.length - 1];
FileStorage fs = new FileStorage(App.getInitParameter(App.getRs(App.RB_AP_CONF)));
return fs.delete(type, elemName);
}
- private String lesen(HttpExchange e) {
+ private String lesen(HttpExchange e) throws IOException, InterruptedException {
String path = e.getRequestURI().toString();
- String[] elems = path.split(App.getRs(Server.RB_SLASH));
+ String[] elems = path.split(Server.SLASH);
FileStorage fs = new FileStorage(App.getInitParameter(App.getRs(App.RB_AP_CONF)));
- if(path.endsWith(App.getRs(RB_SLASH))) {
+ if(path.endsWith(Server.SLASH)) {
List list = null;
if(elems[elems.length - 1].equalsIgnoreCase(App.getRs(RB_EP_LISTE))) {
String type = elems[elems.length - 2];
logger.fine(type);
- list = fs.list(type);
+ if(type.equalsIgnoreCase(ST_GERAET)) {
+ list = fs.listObjects(type);
+ List<Geraet> newList = new ArrayList();
+ Iterator<Entity> i = list.iterator();
+ while(i.hasNext()) {
+ Entity entity = i.next();
+ if(entity instanceof Geraet) {
+ Geraet g = (Geraet) entity;
+ String statusurl = g.getStatusUrl();
+ logger.info(statusurl);
+
+ HttpRequest request = HttpRequest.newBuilder()
+ .uri(URI.create(statusurl))
+ .build();
+ HttpClient client = HttpClient.newBuilder()
+ .version(Version.HTTP_1_1)
+ .followRedirects(Redirect.NORMAL)
+ .connectTimeout(Duration.ofSeconds(20))
+ //.proxy(ProxySelector.of(new InetSocketAddress("proxy.example.com", 80)))
+ //.authenticator(Authenticator.getDefault())
+ .build();
+ HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
+ logger.finer(Integer.toString(response.statusCode()));
+ logger.finer(response.body());
+ // {"ison":false,"has_timer":false,"overpower":false}
+ String[] parts = response.body().split(",")[0].split(":");
+ logger.finer("ison: " + parts[1]);
+ g.setStatus(parts[1]);
+ newList.add(g);
+ }
+ }
+ list = newList;
+ } else {
+ list = fs.list(type);
+ }
+ if(type.equalsIgnoreCase(ST_ABLAGEORT)) {
+ list.add("Livestreams");
+ }
} else {
String type = elems[elems.length - 1];
logger.fine(type);
@@ -102,7 +162,12 @@
@Override
public String get(HttpExchange e) {
- return lesen(e);
+ try {
+ return lesen(e);
+ } catch (IOException | InterruptedException ex) {
+ Logger.getLogger(StorageHandler.class.getName()).log(Level.SEVERE, null, ex);
+ return ex.getLocalizedMessage();
+ }
}
@Override
--
Gitblit v1.9.3