From f9f8196eb463f1c870c61d6db2c7fb56838a3c9b Mon Sep 17 00:00:00 2001
From: ulrich
Date: Sun, 25 Apr 2021 13:34:05 +0000
Subject: [PATCH] 'calypso' aus den Abspieler-Kommandos entfernt, das gehoert zum Abspieler-URL
---
www/ui/js/app.js | 175 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 94 insertions(+), 81 deletions(-)
diff --git a/www/ui/js/app.js b/www/ui/js/app.js
index 4d1d0cf..7f91809 100644
--- a/www/ui/js/app.js
+++ b/www/ui/js/app.js
@@ -45,7 +45,7 @@
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) {
+ self.html_erzeugen("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;
@@ -68,7 +68,7 @@
// Kataloge listen
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.txt", JSON.parse(responseText), function (html) {
+ self.html_erzeugen("data/tpl/katalog_root_liste.txt", JSON.parse(responseText), function (html) {
document.querySelector(".zentraler-inhalt").innerHTML = html;
self.addEvtListener('.entity-eintrag', 'click', function (event) {
var t = event.target;
@@ -94,7 +94,7 @@
for(var index = 0; index < breadcrumbs.length; index++) {
// <a class="breadcrumb-link" href="#">breadcrumbs[index]</a>
if(index === 0) {
- brLinkPfad = '/';
+ brLinkPfad = '';
} else {
brLinkPfad = brLinkPfad + '/' + breadcrumbs[index];
}
@@ -113,7 +113,7 @@
url = url + '/';
}
self.http_get(url, function(responseText) {
- self.vorlage_laden_und_fuellen("data/tpl/katalog_inhalt_liste.txt", JSON.parse(responseText), function (html) {
+ self.html_erzeugen("data/tpl/katalog_inhalt_liste.txt", JSON.parse(responseText), function (html) {
document.querySelector(".zentraler-inhalt").innerHTML = html;
self.addEvtListener('.entity-eintrag', 'click', function (event) {
var t = event.target;
@@ -156,47 +156,36 @@
}
};
+ this.ein_aus_btn = function() {
+ self.addEvtListener('#ein-aus-btn', 'click', function (event) {
+ var geraetName = event.target.attributes.gname.nodeValue;
+ var nameElem = event.target.parentNode.querySelector('.schalt-geraet-name');
+ if(nameElem.classList.contains('schalt-geraet-true')) {
+ // ausschalten
+ self.http_get('../api/gstrg/geraet/' + geraetName + "/aus", function(responseText) {
+ // console.log(responseText);
+ self.geraet_schalt_liste();
+ });
+ } else {
+ // einschalten
+ self.http_get('../api/gstrg/geraet/' + geraetName + "/ein", function(responseText) {
+ // console.log(responseText);
+ self.geraet_schalt_liste();
+ });
+ }
+ });
+ };
+
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) {*/
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-aus-btn', 'click', function (event) {
- var geraetName = event.target.attributes.gname.nodeValue;
- var nameElem = event.target.parentNode.querySelector('.schalt-geraet-name');
- if(nameElem.classList.contains('schalt-geraet-true')) {
- // ausschalten
- self.http_get('../api/gstrg/geraet/' + geraetName + "/aus", function(responseText) {
- // console.log(responseText);
- self.geraet_schalt_liste();
- });
- } else {
- // einschalten
- self.http_get('../api/gstrg/geraet/' + geraetName + "/ein", function(responseText) {
- // console.log(responseText);
- self.geraet_schalt_liste();
- });
- }
- /*
- 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();
- });
- });
- */
- });
+ "", function(responseText) {
+ //var geraet = JSON.parse(responseText);
+ //self.geraet_status_form(geraet);
+ }, self.ein_aus_btn);
};
this.geraet_liste = function() {
@@ -236,7 +225,7 @@
};
this.livestream_liste = function() {
- self.entitaet_liste('Livestream','../api/store/Livestream/liste/',
+ self.entitaet_liste('Livestreams','../api/store/Livestream/liste/',
"data/tpl/livestream_liste.txt", '../api/store/Livestream/',
"self.livestream_form", function(responseText) {
var livestream = JSON.parse(responseText);
@@ -259,7 +248,7 @@
this.abspielliste_form = function(al) {
self.entitaet_form('Abspielliste', al, al.name,
"data/tpl/form_abspielliste.txt", '../api/store/Abspielliste/',
- '#abspielliste-name', function(event) {
+ '#abspielliste-name', 'name', function(event) {
if(event !== undefined) {
event.preventDefault();
}
@@ -271,7 +260,7 @@
this.abspieler_form = function(pl) {
self.entitaet_form('Abspieler', pl, pl.key,
"data/tpl/form_abspieler.txt", '../api/store/Abspieler/',
- '#abspieler-name', function() {
+ '#abspieler-name', 'name', function() {
self.abspieler_auswahl_fuellen();
self.abspieler_liste();
});
@@ -280,7 +269,7 @@
this.livestream_form = function(ls) {
self.entitaet_form('Livestream', ls, ls.name,
"data/tpl/form_livestream.txt", '../api/store/Livestream/',
- '#livestream-name', function() {
+ '#livestream-name', 'name', function() {
self.livestream_liste();
});
};
@@ -288,7 +277,7 @@
this.geraet_form = function(ge) {
self.entitaet_form('Gerät', ge, ge.name,
"data/tpl/form_geraet.txt", '../api/store/Geraet/',
- '#geraet-name', function() {
+ '#geraet-name', 'name', function() {
self.geraet_liste();
});
};
@@ -296,7 +285,7 @@
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() {
+ '#geraet-name', 'name', function() {
self.geraet_schalt_liste();
});
};
@@ -304,7 +293,7 @@
this.prefs_form = function(k) {
self.entitaet_form('Einstellung', k, k.key,
"data/tpl/form_einstellung.txt", '../api/store/Einstellung/',
- '#einstellung-key', function() {
+ '#einstellung-key', 'key', function() {
self.prefs_liste();
});
};
@@ -328,14 +317,14 @@
/* ------------------------------- UI-Dynamik ----------------------- */
self.reset_top_buttons = function() {
- self.vorlage_laden_und_fuellen("data/tpl/top_btns.txt", '', function (html) {
+ self.html_erzeugen("data/tpl/top_btns.txt", '', 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.txt", JSON.parse(responseText), function (html) {
+ self.html_erzeugen("data/tpl/abs_sel.txt", JSON.parse(responseText), function (html) {
document.querySelector(".abs-sel").innerHTML = html;
});
});
@@ -343,7 +332,7 @@
this.abspielliste_auswahl_fuellen = function() {
self.http_get('../api/store/Abspielliste/', function (responseText) {
- self.vorlage_laden_und_fuellen("data/tpl/pl_sel.txt", JSON.parse(responseText), function (html) {
+ self.html_erzeugen("data/tpl/pl_sel.txt", JSON.parse(responseText), function (html) {
document.querySelector(".pl-sel").innerHTML = html;
self.addEvtListener('#playlist', 'change', function() {
self.titel_liste();
@@ -355,7 +344,7 @@
/* Unterer Einblendbereich */
this.dialog_unten_zeigen = function() {
- self.vorlage_laden_und_fuellen("data/tpl/ctrl.txt", "", function (html) {
+ self.html_erzeugen("data/tpl/ctrl.txt", "", function (html) {
var dlg = document.querySelector(".dialog-unten");
//dlg.style.height = '10em';
dlg.innerHTML = html;
@@ -372,6 +361,8 @@
self.addEvtListener('#weiter-btn', 'click', function() {
self.kommando('weiter');
});
+
+ self.addEvtListener('#hier-btn', 'click', self.hier_spielen);
/*
<button class="ctrl-btn ctrl-item" id="hier-btn" title="hier spielen"><i class="icon-tablet"></i></button>
@@ -382,7 +373,7 @@
self.addEvtListener('#media-btn', 'click', self.media_liste);
self.addEvtListener('#plst-btn', 'click', self.titel_liste);
- self.addEvtListener('#live-btn', 'click', self.livestream_liste);
+ self.addEvtListener('#live-btn', 'click', self.livestream_selection);
self.addEvtListener('#switch-btn', 'click', self.geraet_schalt_liste);
self.media_liste();
@@ -398,7 +389,7 @@
var bb = document.querySelector('.breadcrumb-behaelter');
bb.textContent = "";
self.http_get('../api/alist/' + plname, function (responseText) {
- self.vorlage_laden_und_fuellen("data/tpl/titel_liste.txt", JSON.parse(responseText), function (html) {
+ self.html_erzeugen("data/tpl/titel_liste.txt", JSON.parse(responseText), function (html) {
document.querySelector(".zentraler-inhalt").innerHTML = html;
self.addEvtListener('.entity-eintrag', 'click', function (event) {
var t = event.target;
@@ -415,25 +406,7 @@
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);
@@ -463,6 +436,44 @@
self.meldung_mit_timeout(responseText, 1500);
});
};
+
+ this.hier_spielen = function() {
+ var url;
+ // den Host noch vom Server abrufen und den nachfolgenden Code ersetzen
+ var host = 'http://' + window.location.host + '/tango';
+ console.log('host: ' + host);
+ var bereichName = document.querySelector('.bereich-name').textContent;
+ if(bereichName === '') {
+ var titel = self.titelErmitteln(document.querySelector(".selected"));
+ //var playername = document.querySelector('#abspieler').value;
+ console.log(' 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);
+ //});
+ url = host + titel.katalogUrl + titel.pfad + titel.name;
+ window.open(url);
+ } else if(bereichName === 'Livestream-Auswahl') {
+ var streamName = document.querySelector(".selected").textContent;
+ // hier den Stream-URL abrufen
+ //GET /mz/api/store/[typname]/[name]
+ self.http_get('../api/store/Livestream/' + streamName, function(responseText) {
+ var stream = JSON.parse(responseText);
+ url = stream.url;
+ window.open(url);
+ });
+ } else {
+ var lst = document.querySelector('#playlist').value;
+ console.log(
+ "play playlist.value: " + document.querySelector('#playlist').value +
+ ", abspieler.value: " + document.querySelector('#abspieler').value);
+ // hier noch URL fuer Stream der Abspielliste abrufen
+ // Es muss auch noch die Funktion auf dem Server gabut werden, die
+ // eine Abspielliste als Stream liefert
+ url = 'Stream fuer Abspielliste ' + lst + ' noch nicht gebaut.';
+ }
+ console.log('url: ' + url);
+ //window.open(url);
+ };
/* ------------- Verwaltungsfunktionen Abspielliste -------------------- */
@@ -533,14 +544,14 @@
* var ablageort = JSON.parse(responseText);
* self.ablageort_form(ablageort);
* });
- */
+ */
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');
bb.textContent = "";
self.http_get(listUrl, function (responseText) {
- self.vorlage_laden_und_fuellen(tpl, JSON.parse(responseText), function (html) {
+ self.html_erzeugen(tpl, JSON.parse(responseText), function (html) {
document.querySelector(".zentraler-inhalt").innerHTML = html;
self.addEvtListener('.entity-eintrag', 'click', function (event) {
var t = event.target;
@@ -578,13 +589,13 @@
* });
*/
- this.entitaet_form = function(bname, dat, key, tpl, url, selector, cb) {
+ this.entitaet_form = function(bname, dat, key, tpl, url, selector, keyname, cb) {
document.querySelector('.bereich-name').textContent = bname;
- self.vorlage_laden_und_fuellen(tpl, dat, function (html) {
+ self.html_erzeugen(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.handle_submit(event, key, url, selector, keyname, cb);
});
self.addEvtListener('#cancel-btn', 'click', cb);
self.addEvtListener('#loeschen-btn', 'click', function(event) {
@@ -598,13 +609,15 @@
* existingKey: wenn die Entitaet existiert und geandert werden soll
* leer, wenn neue Entitaet
*/
- this.handle_submit = function(event, existingKey, putUrl, keySelector, cb) {
+ this.handle_submit = function(event, existingKey, putUrl, keySelector, keyname, cb) {
event.preventDefault();
const data = new FormData(event.target);
const value = Object.fromEntries(data.entries());
- var daten = JSON.stringify(value);
var formkey = document.querySelector(keySelector).value;
- formkey = formkey.replace(' ', '').replace(/[\W]+/g, '');
+ formkey = formkey.replace(' ', '');
+ formkey = formkey.replace(/[\W]+/g, '');
+ value[keyname] = formkey;
+ var daten = JSON.stringify(value);
if(typeof existingKey === "undefined" || existingKey.length < 1) {
// neu
self.http_put(putUrl + formkey, daten, function (responseText) {
--
Gitblit v1.9.3