From b5c0bc213cf115ee00a3336ab59abb6138cd0304 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Mon, 12 Apr 2021 07:35:21 +0000
Subject: [PATCH] Name Pan auf Startseite

---
 www/ui/js/app.js |   81 ++++++++++++++++++++++++++++++++++++----
 1 files changed, 73 insertions(+), 8 deletions(-)

diff --git a/www/ui/js/app.js b/www/ui/js/app.js
index 4116be0..7837d59 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();
@@ -256,6 +256,20 @@
       self.abspielliste_auswahl_fuellen();
       self.addEvtListener('#dazu-btn', 'click', self.titelDazu);
       self.addEvtListener('#play-btn', 'click', self.play);
+      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();
@@ -285,16 +299,51 @@
   /* ------------- 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() {
@@ -307,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;
@@ -319,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);
@@ -480,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