From 5f1e5b982dc3d6d5cf207d49df85a8e320bd89c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?=
 <noreply.git@mx.bartlomiejpluta.com>
Date: Tue, 7 Jul 2020 21:49:02 +0200
Subject: [PATCH] Fix invalid port indicator

---
 .../com/bartlomiejpluta/ttsserver/core/util/NetworkUtil.kt   | 3 ++-
 .../bartlomiejpluta/ttsserver/core/web/server/WebServer.kt   | 1 +
 .../ttsserver/core/web/server/WebServerFactory.kt            | 2 +-
 app/src/main/res/raw/sonos.lua                               | 5 ++---
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/bartlomiejpluta/ttsserver/core/util/NetworkUtil.kt b/app/src/main/java/com/bartlomiejpluta/ttsserver/core/util/NetworkUtil.kt
index 5becff6..2b1802a 100644
--- a/app/src/main/java/com/bartlomiejpluta/ttsserver/core/util/NetworkUtil.kt
+++ b/app/src/main/java/com/bartlomiejpluta/ttsserver/core/util/NetworkUtil.kt
@@ -4,13 +4,14 @@ import android.content.Context
 import android.content.Context.WIFI_SERVICE
 import android.content.SharedPreferences
 import android.net.wifi.WifiManager
+import com.bartlomiejpluta.ttsserver.core.web.server.WebServer
 import com.bartlomiejpluta.ttsserver.ui.preference.key.PreferenceKey
 import java.net.InetAddress
 
 
 class NetworkUtil(private val context: Context, private val preferences: SharedPreferences) {
    val port: Int
-      get() = preferences.getInt(PreferenceKey.PORT, 8000)
+      get() = preferences.getInt(PreferenceKey.PORT, WebServer.DEFAULT_PORT)
 
    val url: String
       get() = "http://$address:$port"
diff --git a/app/src/main/java/com/bartlomiejpluta/ttsserver/core/web/server/WebServer.kt b/app/src/main/java/com/bartlomiejpluta/ttsserver/core/web/server/WebServer.kt
index 68aa8eb..9e8c008 100644
--- a/app/src/main/java/com/bartlomiejpluta/ttsserver/core/web/server/WebServer.kt
+++ b/app/src/main/java/com/bartlomiejpluta/ttsserver/core/web/server/WebServer.kt
@@ -97,5 +97,6 @@ class WebServer(
 
    companion object {
       private const val MIME_JSON = "application/json"
+      const val DEFAULT_PORT = 8080
    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/bartlomiejpluta/ttsserver/core/web/server/WebServerFactory.kt b/app/src/main/java/com/bartlomiejpluta/ttsserver/core/web/server/WebServerFactory.kt
index 34a97fb..401c5e9 100644
--- a/app/src/main/java/com/bartlomiejpluta/ttsserver/core/web/server/WebServerFactory.kt
+++ b/app/src/main/java/com/bartlomiejpluta/ttsserver/core/web/server/WebServerFactory.kt
@@ -13,7 +13,7 @@ class WebServerFactory(
    private val endpointLoader: EndpointLoader
 ) {
    fun createWebServer() = WebServer(
-      preferences.getInt(PreferenceKey.PORT, 8080),
+      preferences.getInt(PreferenceKey.PORT, WebServer.DEFAULT_PORT),
       context,
       preferences,
       tts,
diff --git a/app/src/main/res/raw/sonos.lua b/app/src/main/res/raw/sonos.lua
index 6006d17..519f8f6 100644
--- a/app/src/main/res/raw/sonos.lua
+++ b/app/src/main/res/raw/sonos.lua
@@ -1,9 +1,8 @@
-local announcementUrl = "http://" .. server.address .. ":8080/cache"
-local snapshot = nil
+local snapshot
 
 function prepareTTSFile(phrase, language)
     local file = tts.sayToFile(phrase, language, AudioFormat.MP3)
-    return announcementUrl .. "/" .. file:getName()
+    return string.format("%s/cache/%s", server.url, file:getName())
 end
 
 function updateSnapshotIfFirst(device)