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 | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/www/ui/js/app.js b/www/ui/js/app.js
index 64f96ce..72a4bc9 100644
--- a/www/ui/js/app.js
+++ b/www/ui/js/app.js
@@ -301,8 +301,9 @@
this.play = function() {
var bereichName = document.querySelector('.bereich-name').textContent;
if(bereichName === '') {
- var elem = document.querySelector(".selected");
+ 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;
@@ -313,24 +314,17 @@
} else {
titel = new Titel(titelName, self.mediaPfad + '/', self.ortPfad, interpret, anzName, album);
}
- var player_sel = document.querySelector('#abspieler');
- var playername = player_sel.value;
- /*
- self.http_put('../api/alist/' + plname, JSON.stringify(titel), function(responseText) {
- //self.meldung_mit_timeout(responseText, 1500);
- });
+ */
+ var playername = document.querySelector('#abspieler').value;
+ /*
+ HTTP POST /mz/api/strg/abspieler/play mit Titel im Body
- HTTP GET /mz/api/strg/abspieler/play/[url]
-
- url: /media/test/M/Muenchener-Freiheit/01-Ohne-Dich-schlaf-ich-heut-Nacht-nicht-ein.mp3
-
- /mz/api/strg/abspieler/play/media/test/M/Muenchener-Freiheit/01-Ohne-Dich-schlaf-ich-heut-Nacht-nicht-ein.mp3
+ 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_get('../api/strg/' + playername + titel.katalogUrl + titel.pfad + titel.name, function(responseText) {
+ 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;
@@ -362,8 +356,9 @@
};
this.titelDazu = function() {
- var elem = document.querySelector(".selected");
+ 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;
@@ -374,6 +369,7 @@
} 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);
@@ -535,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