From c1c2b0718bf63bef70e0bc1d85b7ade1f1523ecd Mon Sep 17 00:00:00 2001
From: ulrich
Date: Fri, 23 Apr 2021 15:29:09 +0000
Subject: [PATCH] Gestaltung weiter angepasst

---
 src/de/uhilger/mediaz/api/StorageHandler.java |   91 +++++++++++++++++++++++----------------------
 1 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/src/de/uhilger/mediaz/api/StorageHandler.java b/src/de/uhilger/mediaz/api/StorageHandler.java
index 62dc218..a8bc567 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,10 @@
 
 /**
  * HttpHandler fuer die Verwaltung von Entitaeten der Mediazentrale
+ * 
+ * GET /mz/api/store/[typname]/[name]
+ * GET /mz/api/store/[typname]/liste
+ * GET /mz/api/store/[typname]/listealles  (nur Typ Geraet)
  * 
  * @author Ulrich Hilger
  * @version 1, 5.4.2021
@@ -106,47 +103,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;               
+          list = collectDeviceStatus(fs, type);
           Gson gson = new Gson();
           Object o = gson.fromJson(bodyLesen(e), fs.typeFromName(type).getType());
-          return gson.toJson(newList);
-        } else {        
-          list = fs.list(type);
+          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");
         }
@@ -182,4 +151,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(Boolean.parseBoolean(parts[1]));
+        newList.add(g);
+      }
+    }
+    return newList;
+  }
 }

--
Gitblit v1.9.3