From a29f5ca76074f014d2a82390610797907528efc1 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Wed, 21 Apr 2021 06:37:03 +0000
Subject: [PATCH] Unterscheidung und Verarbeitung Geraete-Liste mit allen Angaben (auch Status) oder nur Name
---
src/de/uhilger/mediaz/api/StorageHandler.java | 91 ++++++++++++++++++++++++---------------------
1 files changed, 48 insertions(+), 43 deletions(-)
diff --git a/src/de/uhilger/mediaz/api/StorageHandler.java b/src/de/uhilger/mediaz/api/StorageHandler.java
index 5d8db1b..9d9a4be 100644
--- a/src/de/uhilger/mediaz/api/StorageHandler.java
+++ b/src/de/uhilger/mediaz/api/StorageHandler.java
@@ -21,22 +21,16 @@
import com.sun.net.httpserver.HttpExchange;
import de.uhilger.mediaz.App;
import static de.uhilger.mediaz.App.RB_EP_LISTE;
+import static de.uhilger.mediaz.App.RB_EP_LISTE_ALLES;
import de.uhilger.mediaz.Server;
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 de.uhilger.mediaz.store.Storage;
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;
@@ -45,7 +39,6 @@
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;
@@ -55,6 +48,9 @@
/**
* HttpHandler fuer die Verwaltung von Entitaeten der Mediazentrale
+ *
+ * /mz/api/store/[name]/liste
+ * /mz/api/store/[name]/listealles (nur Typ Geraet)
*
* @author Ulrich Hilger
* @version 1, 5.4.2021
@@ -106,44 +102,19 @@
FileStorage fs = new FileStorage(App.getInitParameter(App.getRs(App.RB_AP_CONF)));
if(path.endsWith(Server.SLASH)) {
List list = null;
- if(elems[elems.length - 1].equalsIgnoreCase(App.getRs(RB_EP_LISTE))) {
+ if(elems[elems.length - 1].equalsIgnoreCase(App.getRs(RB_EP_LISTE_ALLES))) {
String type = elems[elems.length - 2];
logger.fine(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);
+ list = collectDeviceStatus(fs, type);
+ Gson gson = new Gson();
+ Object o = gson.fromJson(bodyLesen(e), fs.typeFromName(type).getType());
+ return gson.toJson(list);
}
+ } else 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_ABLAGEORT)) {
list.add("Livestreams");
}
@@ -179,4 +150,38 @@
public boolean delete(HttpExchange e) {
return loeschen(e);
}
+
+ private List collectDeviceStatus(Storage fs, String type) throws IOException, InterruptedException {
+ List 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);
+ }
+ }
+ return newList;
+ }
}
--
Gitblit v1.9.3