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
---
www/ui/js/app.js | 324 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 258 insertions(+), 66 deletions(-)
diff --git a/www/ui/js/app.js b/www/ui/js/app.js
index b03d5e1..5051dd6 100644
--- a/www/ui/js/app.js
+++ b/www/ui/js/app.js
@@ -18,7 +18,7 @@
"hauptmenue.json",
"data/tpl/app-menu.txt",
".west",
- "8em");
+ "6em");
document.querySelector('.hamburger').addEventListener('click', function (e) {
self.menue_umschalten();
@@ -30,6 +30,8 @@
self.addEvtListener('#mi-player', 'click', self.abspieler_liste);
self.addEvtListener('#mi-listen', 'click', self.abspielliste_liste);
self.addEvtListener('#mi-list', 'click', self.titel_liste);
+ self.addEvtListener('#mi-live', 'click', self.livestream_liste);
+ self.addEvtListener('#mi-devices', 'click', self.geraet_liste);
self.fusszeile_umschalten();
self.seitenleiste_umschalten();
@@ -37,12 +39,27 @@
};
/* ---------------- Entitaets-Listen ----------------- */
+
+ this.livestream_selection = function() {
+ document.querySelector('.breadcrumb-behaelter').textContent = '';
+ document.querySelector('.bereich-name').textContent = 'Livestream-Auswahl';
+ self.http_get('../api/store/Livestream/liste/', function(responseText) {
+ self.vorlage_laden_und_fuellen("data/tpl/livestream_liste.txt", JSON.parse(responseText), function (html) {
+ document.querySelector(".zentraler-inhalt").innerHTML = html;
+ self.addEvtListener('.entity-eintrag', 'click', function (event) {
+ var t = event.target;
+ self.removeClassMulti('selected');
+ t.classList.add('selected');
+ });
+ });
+ });
+ };
// auf der obersten Ebene werden die Kataloge angezeigt,
// darunter der Inhalt des aktuellen Pfades
this.media_liste = function() {
self.reset_top_buttons();
- console.log("ortPfad: " + self.ortPfad + ", mediaPfad: " + self.mediaPfad);
+ //console.log("ortPfad: " + self.ortPfad + ", mediaPfad: " + self.mediaPfad);
document.querySelector('.bereich-name').textContent = '';
if(self.ortPfad === '/') {
var bb = document.querySelector('.breadcrumb-behaelter');
@@ -55,11 +72,15 @@
self.addEvtListener('.entity-eintrag', 'click', function (event) {
var t = event.target;
self.katName = t.textContent;
- self.http_get('../api/store/Ablageort/' + t.textContent, function(responseText) {
- var ablageort = JSON.parse(responseText);
- self.ortPfad = ablageort.url;
- self.media_liste();
- });
+ if(self.katName !== "Livestreams") {
+ self.http_get('../api/store/Ablageort/' + t.textContent, function(responseText) {
+ var ablageort = JSON.parse(responseText);
+ self.ortPfad = ablageort.url;
+ self.media_liste();
+ });
+ } else {
+ self.livestream_selection();
+ }
});
});
});
@@ -81,7 +102,7 @@
}
bb.innerHTML = brLinks;
self.addEvtListener('.breadcrumb-link', 'click', function(event) {
- console.log(event.target.attributes.brlink.nodeValue);
+ //console.log(event.target.attributes.brlink.nodeValue);
var neuerPfad = event.target.attributes.brlink.nodeValue;
self.mediaPfad = neuerPfad;
self.media_liste();
@@ -106,7 +127,7 @@
} else {
if(t.classList.contains('selected')) {
t.classList.add('added-to-playlist');
- self.addSelectedTitel();
+ self.titelDazu();
} else {
self.removeClassMulti('selected');
t.classList.add('selected');
@@ -134,6 +155,41 @@
}
};
+ this.geraet_schalt_liste = function() {
+ self.entitaet_liste('Geräte schalten','../api/store/Geraet/listealles/',
+ "data/tpl/geraet_schalt_liste.txt", '../api/store/Geraet/',
+ "self.form_geraet_status", function(responseText) {
+ var geraet = JSON.parse(responseText);
+ self.geraet_status_form(geraet);
+ }, function() {
+ self.addEvtListener('#ein-btn', 'click', function (event) {
+ var geraetName = event.target.attributes.gname.nodeValue;
+ //var geraetName = document.querySelector('.schalt-geraet-name').textContent;
+ self.http_get('../api/gstrg/geraet/' + geraetName + "/ein", function(responseText) {
+ // console.log(responseText);
+ self.geraet_schalt_liste();
+ });
+ });
+ self.addEvtListener('#aus-btn', 'click', function (event) {
+ var geraetName = event.target.attributes.gname.nodeValue;
+ //var geraetName = document.querySelector('.schalt-geraet-name').textContent;
+ self.http_get('../api/gstrg/geraet/' + geraetName + "/aus", function(responseText) {
+ // console.log(responseText);
+ self.geraet_schalt_liste();
+ });
+ });
+ });
+ };
+
+ this.geraet_liste = function() {
+ self.entitaet_liste('Geräte','../api/store/Geraet/liste/',
+ "data/tpl/geraet_liste.txt", '../api/store/Geraet/',
+ "self.geraet_form", function(responseText) {
+ var geraet = JSON.parse(responseText);
+ self.geraet_form(geraet);
+ });
+ };
+
this.ablageort_liste = function() {
self.entitaet_liste('Kataloge','../api/store/Ablageort/liste/',
"data/tpl/ablageort_liste.txt", '../api/store/Ablageort/',
@@ -161,10 +217,20 @@
});
};
+ this.livestream_liste = function() {
+ self.entitaet_liste('Livestream','../api/store/Livestream/liste/',
+ "data/tpl/livestream_liste.txt", '../api/store/Livestream/',
+ "self.livestream_form", function(responseText) {
+ var livestream = JSON.parse(responseText);
+ self.livestream_form(livestream);
+ });
+ };
+
this.abspielliste_liste = function() {
self.entitaet_liste('Abspielliste','../api/store/Abspielliste/liste/',
"data/tpl/abspielliste_liste.txt", '../api/store/Abspielliste/',
"self.abspielliste_form", function(responseText) {
+ //console.log("responseTest: '" + responseText + "'");
var abspielliste = JSON.parse(responseText);
self.abspielliste_form(abspielliste);
});
@@ -176,7 +242,9 @@
self.entitaet_form('Abspielliste', al, al.name,
"data/tpl/form_abspielliste.txt", '../api/store/Abspielliste/',
'#abspielliste-name', function(event) {
- event.preventDefault();
+ if(event !== undefined) {
+ event.preventDefault();
+ }
self.abspielliste_auswahl_fuellen();
self.abspielliste_liste();
});
@@ -188,6 +256,30 @@
'#abspieler-name', function() {
self.abspieler_auswahl_fuellen();
self.abspieler_liste();
+ });
+ };
+
+ this.livestream_form = function(ls) {
+ self.entitaet_form('Livestream', ls, ls.name,
+ "data/tpl/form_livestream.txt", '../api/store/Livestream/',
+ '#livestream-name', function() {
+ self.livestream_liste();
+ });
+ };
+
+ this.geraet_form = function(ge) {
+ self.entitaet_form('Gerät', ge, ge.name,
+ "data/tpl/form_geraet.txt", '../api/store/Geraet/',
+ '#geraet-name', function() {
+ self.geraet_liste();
+ });
+ };
+
+ this.geraet_status_form = function(ge) {
+ self.entitaet_form('Gerät', ge, ge.name,
+ "data/tpl/form_geraet_status.txt", '../api/store/Geraet/',
+ '#geraet-name', function() {
+ self.geraet_schalt_liste();
});
};
@@ -242,50 +334,6 @@
});
};
- this.addSelectedTitel = function() {
- var elem = document.querySelector(".selected");
- //var titelName = elem.textContent;
- var titelName = elem.attributes.dateiName.nodeValue;
- var album = elem.attributes.album.nodeValue;
- var interpret = elem.attributes.interpret.nodeValue;
- var anzName = elem.attributes.titelAnzName.nodeValue;
- var titel;
- if(self.mediaPfad.endsWith('/')) {
- titel = new Titel(titelName, self.mediaPfad, self.ortPfad, interpret, anzName, album);
- } else {
- titel = new Titel(titelName, self.mediaPfad + '/', self.ortPfad, interpret, anzName, album);
- }
- var plname = document.querySelector('#playlist').value;
- self.http_put('../api/alist/' + plname, JSON.stringify(titel), function(responseText) {
- //self.meldung_mit_timeout(responseText, 1500);
- });
- };
-
- this.removeSelectedTitel = function() {
- var elem = document.querySelector(".selected");
- var parentElem = elem.parentNode;
- //console.log("elem: " + elem.nodeName + ", parent: " + parentElem.nodeName + ", len: " + parentElem.childNodes.length);
- var liElems = parentElem.getElementsByTagName(elem.nodeName); // nur die LI Elemente
- //console.log("liElems.anz: " + liElems.length);
- var gefunden = false;
- for(var i = 0; i < liElems.length && !gefunden; i++) {
- //console.log(liElems.item(i).textContent);
- if(liElems.item(i).classList.contains("selected")) {
- gefunden = true;
- var index = i;
- //console.log(elem.textContent + ' hat Index ' + i);
- }
- }
- // /mz/api/alist/[pl-name]/[nr]
- var plname = document.querySelector('#playlist').value;
- self.http_delete('../api/alist/' + plname + '/' + index,'', function(responseText) {
- // DELETE http://localhost:9090/mz/api/alist/liste1/0
- //self.meldung_mit_timeout(responseText, 1500);
- self.titel_liste();
- });
-
- };
-
/* Unterer Einblendbereich */
this.dialog_unten_zeigen = function() {
@@ -295,9 +343,24 @@
dlg.innerHTML = html;
self.abspieler_auswahl_fuellen();
self.abspielliste_auswahl_fuellen();
- self.addEvtListener('#dazu-btn', 'click', self.addSelectedTitel);
+ self.addEvtListener('#dazu-btn', 'click', self.titelDazu);
self.addEvtListener('#play-btn', 'click', self.play);
- self.addEvtListener('#weg-btn', 'click', self.removeSelectedTitel);
+ self.addEvtListener('#stop-btn', 'click', function() {
+ self.kommando('stop');
+ });
+ self.addEvtListener('#pause-btn', 'click', function() {
+ self.kommando('pause');
+ });
+ self.addEvtListener('#weiter-btn', 'click', function() {
+ self.kommando('weiter');
+ });
+
+/*
+ <button class="ctrl-btn ctrl-item" id="hier-btn" title="hier spielen"><i class="icon-tablet"></i></button>
+ */
+
+ self.addEvtListener('#weg-btn', 'click', self.titelWeg);
+ self.addEvtListener('#leeren-btn', 'click', self.alleTitelEntfernen);
self.media_liste();
});
};
@@ -325,14 +388,113 @@
/* ------------- Media-Steuerung ------------------------- */
this.play = function() {
+ var bereichName = document.querySelector('.bereich-name').textContent;
+ if(bereichName === '') {
+ var titel = self.titelErmitteln(document.querySelector(".selected"));
+ //var titelName = elem.textContent;
+ /*
+ var titelName = elem.attributes.dateiName.nodeValue;
+ var album = elem.attributes.album.nodeValue;
+ var interpret = elem.attributes.interpret.nodeValue;
+ var anzName = elem.attributes.titelAnzName.nodeValue;
+ var titel;
+ if(self.mediaPfad.endsWith('/')) {
+ titel = new Titel(titelName, self.mediaPfad, self.ortPfad, interpret, anzName, album);
+ } else {
+ titel = new Titel(titelName, self.mediaPfad + '/', self.ortPfad, interpret, anzName, album);
+ }
+ */
+ var playername = document.querySelector('#abspieler').value;
+ /*
+ HTTP POST /mz/api/strg/abspieler/play mit Titel im Body
+
+ url: /media/test/M/Muenchener-Freiheit/01-Ohne-Dich-schlaf-ich-heut-Nacht-nicht-ein.mp3
+ */
+ console.log('plname: ' + playername + ' url: ' + titel.katalogUrl + titel.pfad + titel.name);
+ self.http_post('../api/strg/' + playername + '/titel', JSON.stringify(titel), function(responseText) {
+ self.meldung_mit_timeout(responseText, 1500);
+ });
+ } else if(bereichName === 'Livestream-Auswahl') {
+ var streamName = document.querySelector(".selected").textContent;
+ var playername = document.querySelector('#abspieler').value;
+ var stream = new Livestream(streamName, '-');
+ self.http_post('../api/strg/' + playername + '/stream', JSON.stringify(stream), function(responseText) {
+ self.meldung_mit_timeout(responseText, 1500);
+ });
+ } else {
+ var abs = document.querySelector('#abspieler').value;
+ var lst = document.querySelector('#playlist').value;
+ console.log(
+ "play playlist.value: " + document.querySelector('#playlist').value +
+ ", abspieler.value: " + document.querySelector('#abspieler').value);
+ self.http_get('../api/strg/' + abs + '/play/liste/' + lst, function(responseText) {
+ self.meldung_mit_timeout(responseText, 1500);
+ });
+ }
+ };
+
+ this.kommando = function(kommando) {
var abs = document.querySelector('#abspieler').value;
- var lst = document.querySelector('#playlist').value;
- console.log(
- "play playlist.value: " + document.querySelector('#playlist').value +
- ", abspieler.value: " + document.querySelector('#abspieler').value);
- self.http_get('../api/strg/' + abs + '/play/liste/' + lst, function(responseText) {
+ self.http_get('../api/strg/' + abs + '/' + kommando, function(responseText) {
self.meldung_mit_timeout(responseText, 1500);
});
+ };
+
+ /* ------------- Verwaltungsfunktionen Abspielliste -------------------- */
+
+ self.alleTitelEntfernen = function() {
+ var plname = document.querySelector('#playlist').value;
+ self.http_delete('../api/alist/' + plname + '/alle', '', function(responseText) {
+ // DELETE http://localhost:9090/mz/api/alist/liste1/0
+ //self.meldung_mit_timeout(responseText, 1500);
+ self.titel_liste();
+ });
+ };
+
+ this.titelDazu = function() {
+ var titel = self.titelErmitteln(document.querySelector(".selected"));
+ //var titelName = elem.textContent;
+ /*
+ var titelName = elem.attributes.dateiName.nodeValue;
+ var album = elem.attributes.album.nodeValue;
+ var interpret = elem.attributes.interpret.nodeValue;
+ var anzName = elem.attributes.titelAnzName.nodeValue;
+ var titel;
+ if(self.mediaPfad.endsWith('/')) {
+ titel = new Titel(titelName, self.mediaPfad, self.ortPfad, interpret, anzName, album);
+ } else {
+ titel = new Titel(titelName, self.mediaPfad + '/', self.ortPfad, interpret, anzName, album);
+ }
+ */
+ var plname = document.querySelector('#playlist').value;
+ self.http_put('../api/alist/' + plname, JSON.stringify(titel), function(responseText) {
+ //self.meldung_mit_timeout(responseText, 1500);
+ });
+ };
+
+ this.titelWeg = function() {
+ var elem = document.querySelector(".selected");
+ var parentElem = elem.parentNode;
+ //console.log("elem: " + elem.nodeName + ", parent: " + parentElem.nodeName + ", len: " + parentElem.childNodes.length);
+ var liElems = parentElem.getElementsByTagName(elem.nodeName); // nur die LI Elemente
+ //console.log("liElems.anz: " + liElems.length);
+ var gefunden = false;
+ for(var i = 0; i < liElems.length && !gefunden; i++) {
+ //console.log(liElems.item(i).textContent);
+ if(liElems.item(i).classList.contains("selected")) {
+ gefunden = true;
+ var index = i;
+ //console.log(elem.textContent + ' hat Index ' + i);
+ }
+ }
+ // /mz/api/alist/[pl-name]/[nr]
+ var plname = document.querySelector('#playlist').value;
+ self.http_delete('../api/alist/' + plname + '/' + index,'', function(responseText) {
+ // DELETE http://localhost:9090/mz/api/alist/liste1/0
+ //self.meldung_mit_timeout(responseText, 1500);
+ self.titel_liste();
+ });
+
};
/* ------------- Helfer fuer Entitaets-Formulare ----------------------- */
@@ -348,7 +510,7 @@
* self.ablageort_form(ablageort);
* });
*/
- this.entitaet_liste = function(bname, listUrl, tpl, storeUrl, formFunc, cb) {
+ this.entitaet_liste = function(bname, listUrl, tpl, storeUrl, formFunc, cb, customListCode) {
self.reset_top_buttons();
document.querySelector('.bereich-name').textContent = bname;
var bb = document.querySelector('.breadcrumb-behaelter');
@@ -363,7 +525,12 @@
//self.addEvtListener('#neu-btn', 'click', function (event) {
self.addEvtListener('#top-neu-btn', 'click', function(event) {
eval(formFunc + "(this)");
- });
+ });
+ if(typeof(customListCode) !== 'function') {
+ // ..
+ } else {
+ customListCode();
+ }
});
});
};
@@ -411,8 +578,6 @@
event.preventDefault();
const data = new FormData(event.target);
const value = Object.fromEntries(data.entries());
- console.log({ value });
- console.log(JSON.stringify(value));
var daten = JSON.stringify(value);
var formkey = document.querySelector(keySelector).value;
formkey = formkey.replace(' ', '').replace(/[\W]+/g, '');
@@ -443,7 +608,7 @@
self.dialog_laden_und_zeigen('data/tpl/dlg-loeschen.txt', dlgdata, function() {
self.addEvtListener('#nein-btn', 'click', self.dialog_schliessen);
self.addEvtListener('#ja-btn', 'click', function(event) {
- console.log("loeschen geklickt.");
+ //console.log("loeschen geklickt.");
self.http_delete(delUrl + pkey, '', function (responseText) {
self.dialog_schliessen();
if(typeof(cb) !== 'function') {
@@ -464,6 +629,20 @@
this.removeClassMulti = function(selector) {
document.querySelectorAll('.' + selector).forEach(elem => { elem.classList.remove(selector); });
+ };
+
+ self.titelErmitteln = function(elem) {
+ var titelName = elem.attributes.dateiName.nodeValue;
+ var album = elem.attributes.album.nodeValue;
+ var interpret = elem.attributes.interpret.nodeValue;
+ var anzName = elem.attributes.titelAnzName.nodeValue;
+ var titel;
+ if(self.mediaPfad.endsWith('/')) {
+ titel = new Titel(titelName, self.mediaPfad, self.ortPfad, interpret, anzName, album);
+ } else {
+ titel = new Titel(titelName, self.mediaPfad + '/', self.ortPfad, interpret, anzName, album);
+ }
+ return titel;
};
/* --------------------- asynchroner HTTP Client ----------------- */
@@ -692,6 +871,11 @@
this.url = u;
}
+function Livestream(n, u) {
+ this.name = n;
+ this.url = u;
+}
+
function Abspielliste(n) {
this.name = n;
}
@@ -703,4 +887,12 @@
this.interpret = i;
this.titelAnzName = t;
this.album = a;
+}
+
+function Geraet(n, e, a, s, st) {
+ this.name = n;
+ this.einUrl = e;
+ this.ausUrl = a;
+ this.statusUrl = s;
+ this.status = st;
}
\ No newline at end of file
--
Gitblit v1.9.3