From 4f2589e620f467d117003a908a0fc1bf2f3c476a Mon Sep 17 00:00:00 2001
From: ulrich
Date: Mon, 12 Apr 2021 06:22:58 +0000
Subject: [PATCH] titelErmitteln
---
www/ui/js/app.js | 196 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 138 insertions(+), 58 deletions(-)
diff --git a/www/ui/js/app.js b/www/ui/js/app.js
index b03d5e1..72a4bc9 100644
--- a/www/ui/js/app.js
+++ b/www/ui/js/app.js
@@ -42,7 +42,7 @@
// 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');
@@ -81,7 +81,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 +106,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');
@@ -165,6 +165,7 @@
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 +177,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();
});
@@ -242,50 +245,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 +254,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 +299,106 @@
/* ------------- 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, JSON.stringify(titel), 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 ----------------------- */
@@ -411,8 +477,8 @@
event.preventDefault();
const data = new FormData(event.target);
const value = Object.fromEntries(data.entries());
- console.log({ value });
- console.log(JSON.stringify(value));
+ //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 +509,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') {
@@ -465,6 +531,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 ----------------- */
--
Gitblit v1.9.3