From 51354aaf71600eccdc3b88fb3a519260d6f5f086 Mon Sep 17 00:00:00 2001
From: jcorporation <mail@jcgames.de>
Date: Wed, 25 Jul 2018 00:47:26 +0100
Subject: [PATCH] cleanup: options and systemd service file fix: mkrelease.sh -
 ignore unknown css properties in compile cleanup: serviceworker

---
 contrib/mympd.service  | 4 ++--
 contrib/options        | 4 ++--
 htdocs/css/mpd.min.css | 1 +
 htdocs/js/mpd.min.js   | 4 ++--
 mkrelease.sh           | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/contrib/mympd.service b/contrib/mympd.service
index f8afeb7..9b27106 100644
--- a/contrib/mympd.service
+++ b/contrib/mympd.service
@@ -1,10 +1,10 @@
 [Unit]
 Description=myMPD server daemon
-Requires=network.target local-fs.target
+Requires=network.target local-fs.target mpd.service
 
 [Service]
 EnvironmentFile=/etc/mympd/options
-ExecStart=/usr/bin/mympd --user $MYMPD_USER --webport $WEB_PORT --mpdhost $MPD_HOST --mpdport $MPD_PORT $MPD_PASSWORD $COVERIMAGE $STATEFILE $SSL
+ExecStart=/usr/bin/mympd --user $MYMPD_USER --webport $WEB_PORT --mpdhost $MPD_HOST --mpdport $MPD_PORT $MPD_PASSWORD --coverimage $COVERIMAGE --statefile $STATEFILE $SSL
 Type=simple
 
 [Install]
diff --git a/contrib/options b/contrib/options
index 2fe36d5..1571abf 100644
--- a/contrib/options
+++ b/contrib/options
@@ -5,5 +5,5 @@ MPD_PORT=6600
 WEB_PORT=80
 SSL=-S -W 443 -C /etc/mympd/ssl/server.pem -K /etc/mympd/ssl/server.key
 MYMPD_USER=nobody
-COVERIMAGE=--coverimage folder.jpg
-STATEFILE=--statefile /var/lib/mympd/mympd.state
+COVERIMAGE=folder.jpg
+STATEFILE=/var/lib/mympd/mympd.state
diff --git a/htdocs/css/mpd.min.css b/htdocs/css/mpd.min.css
index e69de29..ee9d94c 100644
--- a/htdocs/css/mpd.min.css
+++ b/htdocs/css/mpd.min.css
@@ -0,0 +1 @@
+html{position:relative;min-height:100%}body{margin-bottom:60px}footer{position:absolute;bottom:0}body{padding-top:50px;padding-bottom:50px;background-color:#888}button{overflow:hidden}#BrowseBreadrumb{overflow:auto;white-space:nowrap}#BrowseBreadcrumb>li>a{cursor:pointer}#counter{font-size:22px;margin-left:10px;min-width:50px}.card{min-height:350px}@media only screen and (max-width:576px){.header-logo{display:none!important}}.clickable{cursor:pointer}.tblnum,.tblaction{width:30px}.album-cover{background-size:cover;border:1px solid black;border-radius:5px;overflow:hidden;margin-bottom:20px;width:240px;height:240px;background-color:#eee}.hide{display:none!important}.pull-right{float:right!important}.card-toolbar{margin-bottom:10px}.card-toolbar>div,.card-toolbar>form{margin-bottom:5px}@font-face{font-family:'Material Icons';font-style:normal;font-weight:400;src:url(/assets/MaterialIcons-Regular.eot);src:local('Material Icons'),local('MaterialIcons-Regular');src:url(/assets/MaterialIcons-Regular.woff2) format('woff2'),url(/assets/MaterialIcons-Regular.woff) format('woff'),url(/assets/MaterialIcons-Regular.ttf) format('truetype')}.material-icons{font-family:'Material Icons';font-weight:normal;font-style:normal;font-size:18px;display:inline-block;line-height:1;text-transform:none;letter-spacing:normal;word-wrap:normal;white-space:nowrap;direction:ltr;vertical-align:top;-webkit-font-smoothing:antialiased;text-rendering:optimizeLegibility;-moz-osx-font-smoothing:grayscale;font-feature-settings:'liga'}.material-icons-small{font-size:16px}main{padding-top:20px}.color-darkgrey{color:#6c757d}.color-darkgrey:hover{color:#6c757d!important}#btn-outputs-block>button{margin-bottom:10px}#btn-outputs-block>button:last-child{margin-bottom:0}.card-body{overflow-x:hidden}#progressBar{width:100%;margin-top:8px}#volumeBar{margin-top:2px;width:160px}.title-icon{float:left;margin-right:5px;font-size:1.8rem}.header-logo{font-size:2rem;float:left;margin-right:5px}.letters>button{width:28px;height:28px}.col-md{max-width:250px;min-width:250px}a.card-img-top{height:250px;overflow:hidden;display:block}button.active{color:#fff;background-color:#28a745!important;border-color:#28a745!important}div#alertBox{position:fixed;top:50px;right:10px;width:80%;max-width:400px;z-index:1000;opacity:0;visibility:visible;transition:opacity .5s ease-in}div.alertBoxActive{opacity:1!important;visibility:visible!important;transition:opacity .5s ease-in}.popover-content{padding-top:4px;padding-bottom:4px}.opacity05{opacity:.5}caption{caption-side:top;font-size:120%;font-weight:bold;color:black}.dragover>td{border-top:2px solid red}[draggable]{-moz-user-select:none;-khtml-user-select:none;-webkit-user-select:none;user-select:none;-khtml-user-drag:element;-webkit-user-drag:element}
\ No newline at end of file
diff --git a/htdocs/js/mpd.min.js b/htdocs/js/mpd.min.js
index ac31804..4b32d5c 100644
--- a/htdocs/js/mpd.min.js
+++ b/htdocs/js/mpd.min.js
@@ -32,8 +32,8 @@ document.getElementById("addStreamFrm").classList.remove("was-validated")});addF
 $jscomp.arrayFromIterable(a.options));break;default:window[a.cmd].apply(null,$jscomp.arrayFromIterable(a.options))}},!1);a=document.querySelectorAll(".pages");b=a.length;for(c=0;c<b;c++)a[c].addEventListener("click",function(a){"BUTTON"==a.target.nodeName&&gotoPage(a.target.getAttribute("data-page"))},!1);document.getElementById("outputs").addEventListener("click",function(a){"BUTTON"==a.target.nodeName&&a.stopPropagation();sendAPI({cmd:"MPD_API_TOGGLE_OUTPUT",data:{output:a.target.getAttribute("data-output-id"),
 state:a.target.classList.contains("active")?0:1}});toggleBtn(a.target.id)},!1);var e=document.getElementById("QueueList").getElementsByTagName("tbody")[0];e.addEventListener("dragstart",function(a){"TR"==a.target.nodeName&&(a.target.style.display="none",a.dataTransfer.effectAllowed="move",a.dataTransfer.setData("Text",a.target.getAttribute("id")),dragEl=a.target.cloneNode(!0))},!1);e.addEventListener("dragleave",function(a){"TD"==a.target.nodeName&&(a.preventDefault(),a.target.parentNode.classList.remove("dragover"))},
 !1);e.addEventListener("dragover",function(a){a.preventDefault();for(var b=e.querySelectorAll(".dragover"),d=b.length,c=0;c<d;c++)b[c].classList.remove("dragover");a.target.parentNode.classList.add("dragover");a.dataTransfer.dropEffect="move"},!1);e.addEventListener("dragend",function(a){for(var b=e.querySelectorAll(".dragover"),d=b.length,c=0;c<d;c++)b[c].classList.remove("dragover");document.getElementById(a.dataTransfer.getData("Text")).style.display=""},!1);e.addEventListener("drop",function(a){a.stopPropagation();
-a.preventDefault();var b=document.getElementById(a.dataTransfer.getData("Text")).getAttribute("data-songpos"),d=a.target.parentNode.getAttribute("data-songpos");document.getElementById(a.dataTransfer.getData("Text")).remove();dragEl.style.display="";e.insertBefore(dragEl,a.target.parentNode);a=e.getElementsByTagName("tr");for(var c=a.length,k=0;k<c;k++)a[k].classList.remove("dragover");document.getElementById("QueueList").classList.add("opacity05");sendAPI({cmd:"MPD_API_MOVE_TRACK",data:{from:b,to:d}})},
-!1);document.getElementById("QueueList").addEventListener("click",function(a){"TD"==a.target.nodeName?sendAPI({cmd:"MPD_API_PLAY_TRACK",data:{track:a.target.parentNode.getAttribute("data-trackid")}}):"A"==a.target.nodeName&&(a.preventDefault(),showMenu(a.target))},!1);document.getElementById("BrowseFilesystemList").addEventListener("click",function(a){if("TD"==a.target.nodeName)switch(a.target.parentNode.getAttribute("data-type")){case "dir":appGoto("Browse","Filesystem",void 0,"0/"+app.current.filter+
+a.preventDefault();var b=document.getElementById(a.dataTransfer.getData("Text")).getAttribute("data-songpos"),d=a.target.parentNode.getAttribute("data-songpos");document.getElementById(a.dataTransfer.getData("Text")).remove();dragEl.style.display="";e.insertBefore(dragEl,a.target.parentNode);a=e.querySelectorAll(".dragover");for(var c=a.length,k=0;k<c;k++)a[k].classList.remove("dragover");document.getElementById("QueueList").classList.add("opacity05");sendAPI({cmd:"MPD_API_MOVE_TRACK",data:{from:b,
+to:d}})},!1);document.getElementById("QueueList").addEventListener("click",function(a){"TD"==a.target.nodeName?sendAPI({cmd:"MPD_API_PLAY_TRACK",data:{track:a.target.parentNode.getAttribute("data-trackid")}}):"A"==a.target.nodeName&&(a.preventDefault(),showMenu(a.target))},!1);document.getElementById("BrowseFilesystemList").addEventListener("click",function(a){if("TD"==a.target.nodeName)switch(a.target.parentNode.getAttribute("data-type")){case "dir":appGoto("Browse","Filesystem",void 0,"0/"+app.current.filter+
 "/"+decodeURI(a.target.parentNode.getAttribute("data-uri")));break;case "song":appendQueue("song",decodeURI(a.target.parentNode.getAttribute("data-uri")),a.target.parentNode.getAttribute("data-name"));break;case "plist":appendQueue("plist",decodeURI(a.target.parentNode.getAttribute("data-uri")),a.target.parentNode.getAttribute("data-name"))}else"A"==a.target.nodeName&&(a.preventDefault(),showMenu(a.target))},!1);document.getElementById("BrowsePlaylistsAllList").addEventListener("click",function(a){"TD"==
 a.target.nodeName?appendQueue("plist",decodeURI(a.target.parentNode.getAttribute("data-uri")),a.target.parentNode.getAttribute("data-name")):"A"==a.target.nodeName&&(a.preventDefault(),showMenu(a.target))},!1);document.getElementById("BrowsePlaylistsDetailList").addEventListener("click",function(a){"TD"==a.target.nodeName?appendQueue("plist",decodeURI(a.target.parentNode.getAttribute("data-uri")),a.target.parentNode.getAttribute("data-name")):"A"==a.target.nodeName&&(a.preventDefault(),showMenu(a.target))},
 !1);document.getElementById("BrowseDatabaseArtistList").addEventListener("click",function(a){"TD"==a.target.nodeName&&appGoto("Browse","Database","Album","0/-/"+a.target.parentNode.getAttribute("data-uri"))},!1);document.getElementById("SearchList").addEventListener("click",function(a){"TD"==a.target.nodeName?appendQueue("song",decodeURI(a.target.parentNode.getAttribute("data-uri")),a.target.parentNode.getAttribute("data-name")):"A"==a.target.nodeName&&(a.preventDefault(),showMenu(a.target))},!1);
diff --git a/mkrelease.sh b/mkrelease.sh
index 28f044c..a10717c 100755
--- a/mkrelease.sh
+++ b/mkrelease.sh
@@ -23,7 +23,7 @@ if [ -f buildtools/closure-stylesheets.jar ]
 then
   echo "Minifying stylesheets"
   [ htdocs/css/mpd.css -nt htdocs/css/mpd.min.css ] && \
-    java -jar buildtools/closure-stylesheets.jar htdocs/css/mpd.css > htdocs/css/mpd.min.css
+    java -jar buildtools/closure-stylesheets.jar --allow-unrecognized-properties htdocs/css/mpd.css > htdocs/css/mpd.min.css
 else
   echo "buildtools/closure-stylesheets.jar not found, using non-minified files"
   [ htdocs/css/mpd.css -nt htdocs/css/mpd.min.css ] && \