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
---
www/ui/js/app.js | 520 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 401 insertions(+), 119 deletions(-)
diff --git a/www/ui/js/app.js b/www/ui/js/app.js
index a217ade..15e1e64 100644
--- a/www/ui/js/app.js
+++ b/www/ui/js/app.js
@@ -1,24 +1,50 @@
-function Ablageort(n, o, u) {
- this.name = n;
- this.ort = o;
- this.url = u;
-}
-
-
-
function Mediazentrale() {
var self = this;
var appMenu;
var cache; // mustache templates
var ortPfad;
var mediaPfad;
+ var katUrl;
+ var selTitel;
+
+ this.init = function () {
+ self.mediaPfad = '/';
+ self.ortPfad = '/';
+ self.cache = new Array();
+ self.appMenu = new AppMenu();
+ self.appMenu.init(
+ "data/menu/",
+ "hauptmenue.json",
+ "data/tpl/app-menu.tpl",
+ ".west",
+ "8em");
+
+ document.querySelector('.hamburger').addEventListener('click', function (e) {
+ self.menue_umschalten();
+ });
+
+ self.addEvtListener('#mi-katalog', 'click', self.media_liste);
+ self.addEvtListener('#mi-orte', 'click', self.ablageort_liste);
+ self.addEvtListener('#mi-prefs', 'click', self.prefs_liste);
+ 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.fusszeile_umschalten();
+ self.seitenleiste_umschalten();
+ self.dialog_unten_zeigen();
+ };
+ /* ---------------- Entitaets-Listen ----------------- */
+
// auf der obersten Ebene werden die Kataloge angezeigt,
// darunter der Inhalt des aktuellen Pfades
this.media_liste = function() {
+ self.reset_top_buttons();
if(self.ortPfad === '/') {
// Kataloge listen
- self.http_get('../api/store/Ablageort/', function (responseText) {
+ self.http_get('../api/store/Ablageort/liste/', function (responseText) {
+ //document.querySelector('#top-up-btn').removeEventListener('click', self.media_liste_herauf);
self.vorlage_laden_und_fuellen("data/tpl/katalog_root_liste.tpl", JSON.parse(responseText), function (html) {
document.querySelector(".zentraler-inhalt").innerHTML = html;
self.addEvtListener('.entity-eintrag', 'click', function (event) {
@@ -32,52 +58,114 @@
});
});
} else {
- // Pfad listen
- self.http_get('..' + self.ortPfad + '/' + self.mediaPfad + '/', function(responseText) {
- //console.log(responseText);
+ var url = '..' + self.ortPfad + self.mediaPfad;
+ if(!url.endsWith('/')) {
+ url = url + '/';
+ }
+ self.http_get(url, function(responseText) {
self.vorlage_laden_und_fuellen("data/tpl/katalog_inhalt_liste.tpl", JSON.parse(responseText), function (html) {
document.querySelector(".zentraler-inhalt").innerHTML = html;
self.addEvtListener('.entity-eintrag', 'click', function (event) {
var t = event.target;
- //console.log(t.textContent);
+ var tx = t.textContent;
if(t.classList.contains("entity-typ-folder")) {
- self.mediaPfad = self.mediaPfad + '/' + t.textContent;
+ if(self.mediaPfad.endsWith('/')) {
+ self.mediaPfad = self.mediaPfad + tx;
+ } else {
+ self.mediaPfad = self.mediaPfad + '/' + tx;
+ }
self.media_liste();
} else {
- console.log("Media-Inhalt auswaehlen oder abspielen");
+ if(t.classList.contains('selected')) {
+ self.addSelectedTitel();
+ } else {
+ self.removeClassMulti('selected');
+ t.classList.add('selected');
+ }
+ //self.selTitel = new Titel(t.textContent, self.ortPfad);
}
});
- self.addEvtListener('#zurueck-btn', 'click', function (event) {
+ self.addEvtListener('#top-up-btn', 'click', function(event) {
if(self.mediaPfad === '/') {
self.ortPfad = '/';
} else {
var pos = self.mediaPfad.lastIndexOf('/');
- var parent = self.mediaPfad.substring(0, pos);
- //console.log("Parent: " + parent);
+ var parent;
+ if(pos > 1) {
+ parent = self.mediaPfad.substring(0, pos);
+ } else {
+ parent = '/';
+ }
self.mediaPfad = parent;
}
self.media_liste();
- });
+ });
});
});
}
};
-
+
this.ablageort_liste = function() {
- self.http_get('../api/store/Ablageort/', function (responseText) {
- self.vorlage_laden_und_fuellen("data/tpl/ablageort_liste.tpl", JSON.parse(responseText), function (html) {
- document.querySelector(".zentraler-inhalt").innerHTML = html;
- self.addEvtListener('.entity-eintrag', 'click', function (event) {
- var t = event.target;
- self.http_get('../api/store/Ablageort/' + t.textContent, function(responseText){
- var ablageort = JSON.parse(responseText);
- self.ablageort_form(ablageort);
- });
- });
- self.addEvtListener('#neu-btn', 'click', function (event) {
- eval("self.ablageort_form" + "(this)");
- });
+ self.entitaet_liste('../api/store/Ablageort/liste/',
+ "data/tpl/ablageort_liste.tpl", '../api/store/Ablageort/',
+ "self.ablageort_form", function(responseText) {
+ var ablageort = JSON.parse(responseText);
+ self.ablageort_form(ablageort);
});
+ };
+
+ this.prefs_liste = function() {
+ self.entitaet_liste('../api/store/Einstellung/liste/',
+ "data/tpl/einstellung_liste.tpl", '../api/store/Einstellung/',
+ "self.prefs_form", function(responseText) {
+ var einstellung = JSON.parse(responseText);
+ self.prefs_form(einstellung);
+ });
+ };
+
+ this.abspieler_liste = function() {
+ self.entitaet_liste('../api/store/Abspieler/liste/',
+ "data/tpl/abspieler_liste.tpl", '../api/store/Abspieler/',
+ "self.abspieler_form", function(responseText) {
+ var abspieler = JSON.parse(responseText);
+ self.abspieler_form(abspieler);
+ });
+ };
+
+ this.abspielliste_liste = function() {
+ self.entitaet_liste('../api/store/Abspielliste/liste/',
+ "data/tpl/abspielliste_liste.tpl", '../api/store/Abspielliste/',
+ "self.abspielliste_form", function(responseText) {
+ var abspielliste = JSON.parse(responseText);
+ self.abspielliste_form(abspielliste);
+ });
+ };
+
+ /* -------------------- Entitaets-Formulare ------------------ */
+
+ this.abspielliste_form = function(al) {
+ self.entitaet_form(al, al.name,
+ "data/tpl/form_abspielliste.tpl", '../api/store/Abspielliste/',
+ '#abspielliste-name', function() {
+ self.abspielliste_auswahl_fuellen();
+ self.abspielliste_liste();
+ });
+ };
+
+ this.abspieler_form = function(pl) {
+ self.entitaet_form(pl, pl.key,
+ "data/tpl/form_abspieler.tpl", '../api/store/Abspieler/',
+ '#abspieler-name', function() {
+ self.abspieler_auswahl_fuellen();
+ self.abspieler_liste();
+ });
+ };
+
+ this.prefs_form = function(k) {
+ self.entitaet_form(k, k.key,
+ "data/tpl/form_einstellung.tpl", '../api/store/Einstellung/',
+ '#einstellung-key', function() {
+ self.prefs_liste();
});
};
@@ -90,62 +178,258 @@
* @returns {undefined} kein Rueckgabewert
*/
this.ablageort_form = function(ort) {
- self.vorlage_laden_und_fuellen("data/tpl/form_ablageort.tpl", ort, function (html) {
- document.querySelector(".zentraler-inhalt").innerHTML = html;
- self.addEvtListener('#ok-btn', 'click', function () {
- var aName = document.querySelector('#ablageort-name').value;
- aName = aName.replace(' ', '').replace(/[\W]+/g, '');
- var a = new Ablageort(
- aName,
- document.querySelector('#ablageort-ort').value,
- document.querySelector('#ablageort-url').value
- );
- var daten = JSON.stringify(a);
- if(typeof ort === "undefined" || ort.name !== aName) {
- // neu
- self.http_post('../api/store/Ablageort', daten, function (responseText) {
- // hier die Antwort verarbeiten
- });
- } else {
- // aendern
- self.http_put('../api/store/Ablageort', daten, function (responseText) {
- // hier die Antwort verarbeiten
- });
- }
- //document.querySelector(".zentraler-inhalt").innerHTML = '';
+ self.entitaet_form(ort, ort.name,
+ "data/tpl/form_ablageort.tpl", '../api/store/Ablageort/',
+ '#ablageort-name', function() {
self.ablageort_liste();
- });
- self.addEvtListener('#cancel-btn', 'click', function () {
- //document.querySelector(".zentraler-inhalt").innerHTML = '';
- self.ablageort_liste();
- });
- self.addEvtListener('#loeschen-btn', 'click', function() {
- var aoname = document.querySelector('#ablageort-name').value;
- var dlgdata = {"del-elem": aoname};
- self.dialog_laden_und_zeigen('data/tpl/dlg-loeschen.tpl', dlgdata, function() {
- self.addEvtListener('#nein-btn', 'click', self.dialog_schliessen);
- self.addEvtListener('#ja-btn', 'click', function() {
- self.http_delete('../api/store/Ablageort/' + aoname, '', function (responseText) {
- // hier die Antwort verarbeiten
- self.dialog_schliessen();
- //document.querySelector(".zentraler-inhalt").innerHTML = '';
- self.ablageort_liste();
- });
- });
- });
- });
+ });
+ };
+
+ /* ------------------------------- UI-Dynamik ----------------------- */
+
+ self.reset_top_buttons = function() {
+ self.vorlage_laden_und_fuellen("data/tpl/top_btns.tpl", '', function (html) {
+ document.querySelector(".top-btns").innerHTML = html;
+ });
+ };
+
+ this.abspieler_auswahl_fuellen = function() {
+ self.http_get('../api/store/Abspieler/liste/', function (responseText) {
+ self.vorlage_laden_und_fuellen("data/tpl/abs_sel.tpl", JSON.parse(responseText), function (html) {
+ document.querySelector(".abs-sel").innerHTML = html;
+ });
});
};
- this.addEvtListener = function (selector, eventName, func) {
- var elems = document.querySelectorAll(selector);
- var index;
- for (index = 0; index < elems.length; index++) {
- elems[index].addEventListener(eventName, func);
+ this.abspielliste_auswahl_fuellen = function() {
+ self.http_get('../api/store/Abspielliste/', function (responseText) {
+ self.vorlage_laden_und_fuellen("data/tpl/pl_sel.tpl", JSON.parse(responseText), function (html) {
+ document.querySelector(".pl-sel").innerHTML = html;
+ self.addEvtListener('#playlist', 'change', function() {
+ self.titel_liste();
+ });
+ });
+ });
+ };
+
+ 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() {
+ self.vorlage_laden_und_fuellen("data/tpl/ctrl.tpl", "", function (html) {
+ var dlg = document.querySelector(".dialog-unten");
+ dlg.style.height = '4.5em';
+ dlg.innerHTML = html;
+ self.abspieler_auswahl_fuellen();
+ self.abspielliste_auswahl_fuellen();
+ self.addEvtListener('#dazu-btn', 'click', self.addSelectedTitel);
+ self.addEvtListener('#play-btn', 'click', self.play);
+ self.addEvtListener('#weg-btn', 'click', self.removeSelectedTitel);
+ self.media_liste();
+ });
+ };
+
+ /* Titel einer Abspielliste */
+
+ this.titel_liste = function() {
+ self.reset_top_buttons();
+ var plname = document.querySelector('#playlist').value;
+ self.http_get('../api/alist/' + plname, function (responseText) {
+ self.vorlage_laden_und_fuellen("data/tpl/titel_liste.tpl", 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');
+ });
+ });
+ });
+ };
+
+ /* ------------- Media-Steuerung ------------------------- */
+
+ this.play = function() {
+ 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);
+ });
+ };
+
+ /* ------------- Helfer fuer Entitaets-Formulare ----------------------- */
+
+ /*
+ * url: '../api/store/Ablageort/liste/'
+ * tpl: "data/tpl/ablageort_liste.tpl"
+ * storeUrl: '../api/store/Ablageort/'
+ * formFunc: "self.ablageort_form"
+ * cb: etwas wie
+ * function(responseText){
+ * var ablageort = JSON.parse(responseText);
+ * self.ablageort_form(ablageort);
+ * });
+ */
+ this.entitaet_liste = function(listUrl, tpl, storeUrl, formFunc, cb) {
+ self.reset_top_buttons();
+ self.http_get(listUrl, function (responseText) {
+ self.vorlage_laden_und_fuellen(tpl, JSON.parse(responseText), function (html) {
+ document.querySelector(".zentraler-inhalt").innerHTML = html;
+ self.addEvtListener('.entity-eintrag', 'click', function (event) {
+ var t = event.target;
+ self.http_get(storeUrl + t.textContent, cb);
+ });
+ //self.addEvtListener('#neu-btn', 'click', function (event) {
+ self.addEvtListener('#top-neu-btn', 'click', function(event) {
+ eval(formFunc + "(this)");
+ });
+ });
+ });
+ };
+
+ /*
+ * dat: gefuelltes Datenobjekt bei Aenderung
+ * key: der alte schluesselbegriff bei Aenderung (z.B. al.name)
+ * tpl: "data/tpl/form_abspielliste.tpl"
+ * url: '../api/store/Abspielliste/'
+ * selector: '#abspielliste-name'
+ * cbOk: etwas wie
+ * function() {
+ * self.abspielliste_auswahl_fuellen();
+ * self.abspielliste_liste();
+ * });
+ * delSelector: '#abspielliste-name'
+ * cbDel: etwas wie
+ * function() {
+ * self.abspielliste_auswahl_fuellen();
+ * self.abspielliste_liste();
+ * });
+ */
+
+ this.entitaet_form = function(dat, key, tpl, url, selector, cb) {
+ self.vorlage_laden_und_fuellen(tpl, dat, function (html) {
+ document.querySelector(".zentraler-inhalt").innerHTML = html;
+ const form = document.querySelector('form');
+ form.addEventListener('submit', function(event) {
+ self.handle_submit(event, key, url, selector, cb);
+ });
+ self.addEvtListener('#cancel-btn', 'click', cb);
+ self.addEvtListener('#loeschen-btn', 'click', function(event) {
+ event.preventDefault();
+ self.handle_del_btn(selector, url, cb);
+ });
+ });
+ };
+
+ /*
+ * existingKey: wenn die Entitaet existiert und geandert werden soll
+ * leer, wenn neue Entitaet
+ */
+ this.handle_submit = function(event, existingKey, putUrl, keySelector, cb) {
+ 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, '');
+ if(typeof existingKey === "undefined" || existingKey.length < 1) {
+ // neu
+ self.http_put(putUrl + formkey, daten, function (responseText) {
+ if(typeof(cb) !== 'function') {
+ // ..
+ } else {
+ cb();
+ }
+ });
+ } else {
+ // aendern
+ self.http_put(putUrl + existingKey, daten, function (responseText) {
+ if(typeof(cb) !== 'function') {
+ // ..
+ } else {
+ cb();
+ }
+ });
}
};
+
+ this.handle_del_btn = function(selectorKey, delUrl, cb) {
+ var pkey = document.querySelector(selectorKey).value;
+ var dlgdata = {"del-elem": pkey};
+ self.dialog_laden_und_zeigen('data/tpl/dlg-loeschen.tpl', dlgdata, function() {
+ self.addEvtListener('#nein-btn', 'click', self.dialog_schliessen);
+ self.addEvtListener('#ja-btn', 'click', function(event) {
+ console.log("loeschen geklickt.");
+ self.http_delete(delUrl + pkey, '', function (responseText) {
+ self.dialog_schliessen();
+ if(typeof(cb) !== 'function') {
+ // ..
+ } else {
+ cb();
+ }
+ });
+ });
+ });
+ };
+
+ /* ------------------ sonstige Helfer ----------------------- */
+
+ this.addEvtListener = function(selector, eventName, func) {
+ document.querySelectorAll(selector).forEach(elem => { elem.addEventListener(eventName, func); });
+ };
+
+ this.removeClassMulti = function(selector) {
+ document.querySelectorAll('.' + selector).forEach(elem => { elem.classList.remove(selector); });
+ };
- /* asynchroner HTTP Client */
+ /* --------------------- asynchroner HTTP Client ----------------- */
this.http_get = function (u, cb) {
self.http_call('GET', u, null, cb);
@@ -160,7 +444,7 @@
};
this.http_delete = function (u, data, cb) {
- console.log("delete " + u);
+ // console.log("delete " + u);
self.http_call('DELETE', u, data, cb);
};
@@ -181,39 +465,7 @@
}
};
- /* Unterer Einblendbereich */
-
- self.dialog_unten_zeigen = function() {
- self.vorlage_laden_und_fuellen("data/tpl/ctrl.tpl", "", function (html) {
- var dlg = document.querySelector(".dialog-unten");
- dlg.style.height = '4.5em';
- dlg.innerHTML = html;
- });
- };
-
- /* ab hier aus App-Vorlage */
-
- this.init = function () {
- //self.vorlagen = new Vorlagen();
- self.mediaPfad = '/';
- self.ortPfad = '/';
- self.cache = new Array();
- self.appMenu = new AppMenu();
- self.appMenu.init(
- "data/menu/",
- "hauptmenue.json",
- "data/tpl/app-menu.tpl",
- ".west",
- "8em");
-
- document.querySelector('.hamburger').addEventListener('click', function (e) {
- self.menue_umschalten();
- });
-
- self.fusszeile_umschalten();
- self.seitenleiste_umschalten();
- self.dialog_unten_zeigen();
- };
+ /* ------------------------ aus App-Vorlage ------------------- */
this.menue_umschalten = function () {
var ham = document.querySelector(".hamburger");
@@ -290,7 +542,7 @@
}, timeout);
};
- /* Dialog-Funktionen */
+ /* --------------------- Dialog-Funktionen ------------------------ */
/*
Einen Dialog aus Vorlagen erzeugen
@@ -324,14 +576,14 @@
});
};
- self.dialog_schliessen = function () {
+ this.dialog_schliessen = function () {
document.querySelector('.close-btn').removeEventListener('click', self.dialog_schliessen);
var dlg = document.querySelector('.dialog');
dlg.style.height = '0';
dlg.innerHTML = '';
};
- /* Vorlagen */
+ /* --------------------- Vorlagen ---------------------- */
/*
Das HTML erzeugen, das entsteht, wenn eine Vorlage mit Inhalt
@@ -385,3 +637,33 @@
}
+/* ----------- Objekte ---------------- */
+
+function Ablageort(n, o, u) {
+ this.name = n;
+ this.ort = o;
+ this.url = u;
+}
+
+function Einstellung(k, v) {
+ this.key = k;
+ this.value = v;
+}
+
+function Abspieler(n, u) {
+ this.name = n;
+ this.url = u;
+}
+
+function Abspielliste(n) {
+ this.name = n;
+}
+
+function Titel(n, p, u, i, t, a) {
+ this.katalogUrl = u;
+ this.pfad = p;
+ this.name = n;
+ this.interpret = i;
+ this.titelAnzName = t;
+ this.album = a;
+}
\ No newline at end of file
--
Gitblit v1.9.3