From 2af7d6512096c84b028011503246ce86deec540f Mon Sep 17 00:00:00 2001
From: ulrich
Date: Wed, 21 Apr 2021 12:59:07 +0000
Subject: [PATCH] Vorlagencache aktiviert
---
src/de/uhilger/mediaz/api/StorageHandler.java | 282 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 157 insertions(+), 125 deletions(-)
diff --git a/src/de/uhilger/mediaz/api/StorageHandler.java b/src/de/uhilger/mediaz/api/StorageHandler.java
index f2936eb..4fb549e 100644
--- a/src/de/uhilger/mediaz/api/StorageHandler.java
+++ b/src/de/uhilger/mediaz/api/StorageHandler.java
@@ -1,155 +1,187 @@
/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ Mediazentrale - Personal Media Center
+ Copyright (C) 2021 Ulrich Hilger
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.uhilger.mediaz.api;
import com.google.gson.Gson;
import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
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.Ablageort;
import de.uhilger.mediaz.entity.Entity;
-import java.io.BufferedReader;
-import java.io.File;
+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 de.uhilger.mediaz.store.Storage;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
+import java.net.URI;
+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.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.time.Duration;
+import java.util.ArrayList;
+
+
/**
- *
- * @author ulrich
+ * 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
*/
-public class StorageHandler implements HttpHandler {
+public class StorageHandler extends AbstractHandler {
private static final Logger logger = Logger.getLogger(StorageHandler.class.getName());
+ @Override
+ protected String put(HttpExchange e) throws IOException {
+ String path = e.getRequestURI().toString();
+ 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))) {
+ FileStorage fs = new FileStorage(App.getInitParameter(App.getRs(App.RB_AP_CONF)));
+ Gson gson = new Gson();
+ logger.log(Level.FINE, "type: {0}, token: {1}", new Object[]{type, fs.typeFromName(type).getType().getTypeName()});
+ Object o = gson.fromJson(bodyLesen(e), fs.typeFromName(type).getType());
+ if(o instanceof Entity) {
+ Entity entity = (Entity) o;
+ if(fs.exists(type, elemName)) {
+ fs.delete(type, elemName);
+ fs.write(entity, true);
+ } else {
+ fs.write(entity, false);
+ }
+ return type + Server.SLASH + entity.getName();
+ } else {
+ return "Ungueltiges Objekt im Body.";
+ }
+ } else {
+ return "Ungueltiger Elementname: " + App.getRs(RB_EP_LISTE);
+ }
+ }
- /*
+ private boolean loeschen(HttpExchange e) {
+ String path = e.getRequestURI().toString();
+ 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);
+ }
- HTTP GET: lies einen Ablageort und schreibe JSON
- HTTP PUT: schreibe einen neuen Ablageort auf die Platte
- HTTP POST: schreibe Aenderungen auf die Platte
- HTTP DELETE: loesche den Ablageort
+ private String lesen(HttpExchange e) throws IOException, InterruptedException {
+ String path = e.getRequestURI().toString();
+ String[] elems = path.split(Server.SLASH);
+ 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_ALLES))) {
+ String type = elems[elems.length - 2];
+ logger.fine(type);
+ if(type.equalsIgnoreCase(ST_GERAET)) {
+ 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");
+ }
+ } else {
+ String type = elems[elems.length - 1];
+ logger.fine(type);
+ list = fs.listObjects(type);
+ }
+ return jsonWithEnclosingType(list);
+ } else {
+ String type = elems[elems.length - 2];
+ String elemName = elems[elems.length - 1];
+ return fs.readJson(type, elemName);
+ }
+ }
- Beispiele:
-
- HTTP GET an /mz/api/store/Ablageort/Katalog
- liest den Ablageort namens "Katalog"
-
- HTTP POST an /mz/api/store/Ablageort
- schreibt den neuen Ablageort im Body der Anfrage (Neu)
-
- HTTP PUT an /mz/api/store/Ablageort
- sucht den Ablageort mit dem Namen laut Body der Anfrage
- und schreibt den Inhalt aus der Anfrage in die Datei (Aenderung)
-
- HTTP DELETE an /mz/api/store/Ablageort/Katalog
- löscht den Ablageort namens "Katalog"
-
- */
-
- public static final String HTTP_GET = "GET";
- public static final String HTTP_PUT = "PUT";
- public static final String HTTP_POST = "POST";
- public static final String HTTP_DELETE = "DELETE";
+ @Override
+ public String get(HttpExchange e) {
+ try {
+ return lesen(e);
+ } catch (IOException | InterruptedException ex) {
+ Logger.getLogger(StorageHandler.class.getName()).log(Level.SEVERE, null, ex);
+ return ex.getLocalizedMessage();
+ }
+ }
@Override
- public void handle(HttpExchange e) throws IOException {
- String method = e.getRequestMethod();
- String path = e.getRequestURI().toString();
- String[] elems = path.split(App.getRs(Server.RB_SLASH));
- String type = "";
- String elemName = "";
- String body = "";
- FileStorage fs = new FileStorage(App.getInitParameter(App.getRs(App.RB_AP_CONF)));
- switch(method) {
- case HTTP_GET:
- type = elems[elems.length - 2];
- elemName = elems[elems.length - 1];
- //this.readFromFile(file);
- fs.read(type, elemName);
- break;
-
- case HTTP_PUT:
- type = elems[elems.length - 1];
- elemName = "noch bauen: lesen aus Body";
- break;
-
- case HTTP_POST:
- neu(e);
- break;
-
- case HTTP_DELETE:
- type = elems[elems.length - 2];
- elemName = elems[elems.length - 1];
- break;
- }
-
-
- String response = "Method: " + method + ", Path: " + path +
- ", Type: " + type + ", elemName: " + elemName;
- logger.info(response);
- e.sendResponseHeaders(200, response.length());
- OutputStream os = e.getResponseBody();
- os.write(response.getBytes());
- os.close();
+ public String post(HttpExchange e) {
+ return "nicht unterstuetzt";
+ }
+
+ @Override
+ public boolean delete(HttpExchange e) {
+ return loeschen(e);
}
- private void neu(HttpExchange e) throws IOException {
- String path = e.getRequestURI().toString();
- String[] elems = path.split(App.getRs(Server.RB_SLASH));
- String type = elems[elems.length - 1];
- String body = bodyLesen(e);
- FileStorage fs = new FileStorage(App.getInitParameter(App.getRs(App.RB_AP_CONF)));
- Gson gson = new Gson();
- logger.log(Level.INFO, "type: {0}", type);
- Object o = gson.fromJson(body, fs.typeFromName(type).getType());
- if(o instanceof Entity) {
- Object antwortObjekt = fs.write((Entity) o);
- if(antwortObjekt instanceof File) {
- File file = (File) antwortObjekt;
- logger.log(Level.INFO, "Datei {0} geschrieben.", file.getAbsolutePath());
+ 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);
}
}
- }
-
- private void aendern() {
-
- }
-
- private void loeschen() {
-
- }
-
- private Entity lesen() {
- return null;
- }
-
-
- private String bodyLesen(HttpExchange e) throws IOException {
- InputStream is = e.getRequestBody();
- BufferedReader r = new BufferedReader(new InputStreamReader(is));
- StringBuilder sb = new StringBuilder();
- String line = r.readLine();
- while(line != null) {
- sb.append(line);
- line = r.readLine();
- }
- r.close();
- // {"Ablageort":{"name":"test1","ort":"test2","url":"test3"}}
- //String data = sb.toString();
- //data = data.substring(1, data.length() - 1);
- //String json = data.substring(data.indexOf("{"));
- // {"name":"test1","ort":"test2","url":"test3"}
- String json = sb.toString();
- logger.log(Level.INFO, "json: {0}", json);
- return json;
+ return newList;
}
}
--
Gitblit v1.9.3