From 5898509f4ca658690c4d4bc0e1784a8ecbff4178 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Sat, 10 Apr 2021 16:09:30 +0000
Subject: [PATCH] Abspielliste abspielen fertig, stop, pause, weiter fertig
---
src/de/uhilger/mediaz/api/StorageHandler.java | 189 ++++++++++++----------------------------------
1 files changed, 50 insertions(+), 139 deletions(-)
diff --git a/src/de/uhilger/mediaz/api/StorageHandler.java b/src/de/uhilger/mediaz/api/StorageHandler.java
index 5899bef..d12e6c1 100644
--- a/src/de/uhilger/mediaz/api/StorageHandler.java
+++ b/src/de/uhilger/mediaz/api/StorageHandler.java
@@ -19,18 +19,12 @@
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 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 java.io.BufferedReader;
-import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -41,131 +35,41 @@
* @author Ulrich Hilger
* @version 1, 5.4.2021
*/
-public class StorageHandler extends AbstractHandler implements HttpHandler {
+public class StorageHandler extends AbstractHandler {
private static final Logger logger = Logger.getLogger(StorageHandler.class.getName());
-
- /*
- Das REST-Muster sieht je Entitaet fuenf Faelle vor (Beispiel Ablageort):
-
- 1. HTTP GET Ablageort/[Name]: Liefere den Ablageort als JSON
- 2. HTTP GET Ablageort/: Liefere einer Liste von Ablageorten als JSON
- 3. HTTP PUT: schreibe einen neuen Ablageort auf die Platte
- 4. HTTP POST: schreibe Aenderungen auf die Platte
- 5. HTTP DELETE: loesche den Ablageort
-
- Beispiele:
-
- HTTP GET an /mz/api/store/Ablageort/
- liefert eine Liste der Namen vorhandener Ablageorte
-
- 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"
-
- */
-
- /** Name der HTTP Methode GET */
- public static final String HTTP_GET = "GET";
-
- /** Name der HTTP Methode PUT */
- public static final String HTTP_PUT = "PUT";
-
- /** Name der HTTP Methode POST */
- public static final String HTTP_POST = "POST";
-
- /** Name der HTTP Methode DELETE */
- public static final String HTTP_DELETE = "DELETE";
-
@Override
- public void handle(HttpExchange e) throws IOException {
- String method = e.getRequestMethod();
- String response = "";
- int code = 200;
- switch(method) {
- case HTTP_GET:
- String json = lesen(e);
- if(json != null) {
- response = json;
- } else {
- response = "nicht gefunden";
- code = 404;
- }
- break;
-
- case HTTP_PUT:
- response = aendern(e);
- break;
-
- case HTTP_POST:
- response = neu(e);
- break;
-
- case HTTP_DELETE:
- boolean geloescht = loeschen(e);
- if(geloescht) {
- response = "geloescht";
- } else {
- response = "nicht geloescht";
- }
- break;
- }
- logger.fine(response);
- e.sendResponseHeaders(code, response.length());
- OutputStream os = e.getResponseBody();
- os.write(response.getBytes());
- os.close();
- }
-
- private String neu(HttpExchange e) throws IOException {
- return schreiben(e, false);
- }
-
- private String aendern(HttpExchange e) throws IOException {
- return schreiben(e, true);
- }
-
- private String schreiben(HttpExchange e, boolean overwrite) throws IOException {
+ protected String put(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);
- String filename = "";
- 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(body, fs.typeFromName(type).getType());
- if(o instanceof Entity) {
- Object antwortObjekt = fs.write((Entity) o, overwrite);
- if(antwortObjekt instanceof File) {
- File file = (File) antwortObjekt;
- logger.log(Level.FINE, "Datei {0} geschrieben.", file.getAbsolutePath());
- filename = file.getName();
- return type + FileHandler.STR_BLANK + filename;
+ 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);
}
- return type + FileHandler.STR_BLANK + " Operation 'neu' fuer bereits existierende Entitaet.";
}
-
- /*
- private String aendern(HttpExchange e) throws IOException {
- return neu(e); // einstweilen wird einfach ueberschrieben
- }
- */
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)));
@@ -174,12 +78,19 @@
private String lesen(HttpExchange e) {
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))) {
- String type = elems[elems.length - 1];
- logger.fine(type);
- List list = fs.list(type);
+ 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);
+ } else {
+ String type = elems[elems.length - 1];
+ logger.fine(type);
+ list = fs.listObjects(type);
+ }
return jsonWithEnclosingType(list);
} else {
String type = elems[elems.length - 2];
@@ -188,18 +99,18 @@
}
}
- 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();
- String json = sb.toString();
- logger.log(Level.FINE, "json: {0}", json);
- return json;
+ @Override
+ public String get(HttpExchange e) {
+ return lesen(e);
+ }
+
+ @Override
+ public String post(HttpExchange e) {
+ return "nicht unterstuetzt";
+ }
+
+ @Override
+ public boolean delete(HttpExchange e) {
+ return loeschen(e);
}
}
--
Gitblit v1.9.3