From: marcelveldt <marcelvanderveldt@MacBook-Silvia.local>
Date: Wed, 16 Oct 2019 08:26:09 +0000 (+0200)
Subject: some fixes
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=d35f7beea2a3097aa93683cb1dda46fc7e9c9223;p=music-assistant-server.git

some fixes

attempt to create smaller docker image
some translation strings updated
---

diff --git a/Dockerfile b/Dockerfile
index e5e9bbbc..bdd5c698 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,17 @@
 FROM python:3.7-buster
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
-		flac sox zip curl wget ffmpeg libsndfile1 libtag1-dev build-essential \
-        python3-numpy python3-scipy python3-matplotlib python3-taglib \
-	&& rm -rf /var/lib/apt/lists/*
-
 COPY requirements.txt requirements.txt
-RUN pip install -r requirements.txt
+RUN apt-get update && apt-get install -y --no-install-recommends \
+		# required packages
+		flac sox libsox-fmt-mp3 zip curl wget ffmpeg libsndfile1 \
+		python3-numpy python3-scipy python3-matplotlib python3-taglib \
+		# build packages
+		libtag1-dev build-essential && \
+	# install required python packages with pip
+	pip install -r requirements.txt && \
+	# cleanup build packages
+	apt-get remove --purge -y build-essential libtag1-dev $(apt-mark showauto) && \
+	rm -rf /var/lib/apt/lists/*
 
 # copy app files
 RUN mkdir -p /usr/src/app
diff --git a/music_assistant/web.py b/music_assistant/web.py
index f4fff6bb..1ac65d8e 100755
--- a/music_assistant/web.py
+++ b/music_assistant/web.py
@@ -15,7 +15,7 @@ from .utils import run_periodic, LOGGER, run_async_background_task, get_ip, json
 
 CONF_KEY = 'web'
 CONFIG_ENTRIES = [
-        ('http_port', 8095, 'webhttp_port'),
+        ('http_port', 8095, 'web_http_port'),
         ('https_port', 8096, 'web_https_port'),
         ('ssl_certificate', '', 'web_ssl_cert'), 
         ('ssl_key', '', 'web_ssl_key'),
diff --git a/music_assistant/web/strings.js b/music_assistant/web/strings.js
index 5c1df076..02a35846 100644
--- a/music_assistant/web/strings.js
+++ b/music_assistant/web/strings.js
@@ -33,8 +33,7 @@ const messages = {
             tunein: "TuneIn",
             file: "Filesystem",
             chromecast: "Chromecast",
-            lms: "Logitech Media Server",
-            pylms: "Emulated (built-in) Squeezebox support",
+            squeezebox: "Squeezebox support",
             username: "Username",
             password: "Password",
             hostname: "Hostname (or IP)",
@@ -71,7 +70,9 @@ const messages = {
             not_grouped: "Not grouped",
             conf_saved: "Configuration saved, restart app to make effective",
             audio_cache_folder: "Directory to use for cache files",
-            audio_cache_max_size_gb: "Maximum size of the cache folder (GB)"
+            audio_cache_max_size_gb: "Maximum size of the cache folder (GB)",
+            gapless_enabled: "Enable gapless support",
+            crossfade_duration: "Crossfade duration (in seconds, 0 to disable)"
         },
         // player strings
         players: "Players",
@@ -121,8 +122,7 @@ const messages = {
             tunein: "TuneIn",
             file: "Bestandssysteem",
             chromecast: "Chromecast",
-            lms: "Logitech Media Server",
-            pylms: "Geemuleerde (ingebouwde) Squeezebox ondersteuning",
+            squeezebox: "Squeezebox ondersteuning",
             username: "Gebruikersnaam",
             password: "Wachtwoord",
             hostname: "Hostnaam (of IP)",
@@ -159,7 +159,9 @@ const messages = {
             not_grouped: "Niet gegroepeerd",
             conf_saved: "Configuratie is opgeslagen, herstart om actief te maken",
             audio_cache_folder: "Map om te gebruiken voor cache bestanden",
-            audio_cache_max_size_gb: "Maximale grootte van de cache map in GB."
+            audio_cache_max_size_gb: "Maximale grootte van de cache map in GB.",
+            gapless_enabled: "Schakel ondersteuning voor gapless in.",
+            crossfade_duration: "Crossfade in (seconden, 0 om uit te schakelen)."
         },
         // player strings
         players: "Spelers",