Shuffle around LocalEnvConfig

thewca · Jan 6, 2024 · 28d0cb6 · 28d0cb6
1 parent 4f4dbd5
commit 28d0cb6
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/...jar/src/main/kotlin/org/worldcubeassociation/tnoodle/deployable/jar/WebscramblesServer.kt b/...jar/src/main/kotlin/org/worldcubeassociation/tnoodle/deployable/jar/WebscramblesServer.kt
@@ -11,7 +11,7 @@ import org.slf4j.LoggerFactory
 import org.worldcubeassociation.tnoodle.server.ApplicationHandler
 import org.worldcubeassociation.tnoodle.server.TNoodleServer
 import org.worldcubeassociation.tnoodle.server.ServerEnvironmentConfig
-import org.worldcubeassociation.tnoodle.deployable.jar.config.LocalServerEnvironmentConfig
+import org.worldcubeassociation.tnoodle.server.config.LocalServerEnvironmentConfig
 import org.worldcubeassociation.tnoodle.deployable.jar.routing.HomepageHandler
 import org.worldcubeassociation.tnoodle.deployable.jar.routing.IconHandler
 import org.worldcubeassociation.tnoodle.deployable.jar.routing.ReadmeHandler
@@ -58,7 +58,7 @@ class WebscramblesServer(environmentConfig: ServerEnvironmentConfig) : Applicati
             val onlineConfig by parser.flagging("-o", "--online", help = "Change configuration for online mode. This will override port bindings and sun.awt.fontconfig")
 
             val port = System.getenv("PORT")?.takeIf { onlineConfig }?.toIntOrNull() ?: cliPort
-            val offlineHandler = OfflineJarUtils(port)
+            val offlineHandler = OfflineJarUtils(port, LocalServerEnvironmentConfig)
 
             val isWrapped = if (!noReexec) {
                 MainLauncher.wrapMain(args, MIN_HEAP_SIZE_MEGS)

diff --git a/...ar/src/main/kotlin/org/worldcubeassociation/tnoodle/deployable/jar/server/MainLauncher.kt b/...ar/src/main/kotlin/org/worldcubeassociation/tnoodle/deployable/jar/server/MainLauncher.kt
@@ -1,6 +1,7 @@
 package org.worldcubeassociation.tnoodle.deployable.jar.server
 
 import org.slf4j.LoggerFactory
+import org.worldcubeassociation.tnoodle.server.config.WebServerUtils
 import java.io.File
 import java.io.IOException
 import kotlin.math.max

diff --git a/...src/main/kotlin/org/worldcubeassociation/tnoodle/deployable/jar/server/OfflineJarUtils.kt b/...src/main/kotlin/org/worldcubeassociation/tnoodle/deployable/jar/server/OfflineJarUtils.kt
@@ -3,14 +3,14 @@ package org.worldcubeassociation.tnoodle.deployable.jar.server
 import dorkbox.systemTray.SystemTray
 import dorkbox.systemTray.MenuItem
 import org.slf4j.LoggerFactory
-import org.worldcubeassociation.tnoodle.deployable.jar.config.LocalServerEnvironmentConfig
+import org.worldcubeassociation.tnoodle.server.ServerEnvironmentConfig
 import java.awt.*
 import java.io.IOException
 import java.net.URI
 import java.net.URISyntaxException
 import kotlin.system.exitProcess
 
-data class OfflineJarUtils(val port: Int) {
+data class OfflineJarUtils(val port: Int, val envConfig: ServerEnvironmentConfig) {
     val url = "http://localhost:$port"
 
     fun openTabInBrowser() {
@@ -60,7 +60,7 @@ data class OfflineJarUtils(val port: Int) {
 
         trayAdapter.menu.add(exitItem)
 
-        val tooltip = "${LocalServerEnvironmentConfig.projectName} v${LocalServerEnvironmentConfig.projectVersion}"
+        val tooltip = "${envConfig.projectName} v${envConfig.projectVersion}"
         trayAdapter.setTooltip(tooltip)
         trayAdapter.status = tooltip
 

diff --git a/server/src/main/kotlin/org/worldcubeassociation/tnoodle/server/TNoodleServer.kt b/server/src/main/kotlin/org/worldcubeassociation/tnoodle/server/TNoodleServer.kt
@@ -12,6 +12,7 @@ import io.ktor.server.plugins.statuspages.*
 import io.ktor.server.routing.*
 import io.ktor.server.websocket.*
 import kotlinx.serialization.SerializationException
+import org.worldcubeassociation.tnoodle.server.config.LocalServerEnvironmentConfig
 import org.worldcubeassociation.tnoodle.server.exceptions.BadWcifParameterException
 import org.worldcubeassociation.tnoodle.server.exceptions.ScheduleMatchingException
 import org.worldcubeassociation.tnoodle.server.exceptions.ScrambleMatchingException
@@ -30,7 +31,7 @@ import org.worldcubeassociation.tnoodle.server.routing.frontend.WcifDataHandler
 import java.io.DataInputStream
 import java.io.DataOutputStream
 
-class TNoodleServer(val environmentConfig: ServerEnvironmentConfig) : ApplicationHandler {
+class TNoodleServer(val environmentConfig: ServerEnvironmentConfig = LocalServerEnvironmentConfig) : ApplicationHandler {
     override fun spinUp(app: Application) {
         initPruning()
 

diff --git a/...ar/config/LocalServerEnvironmentConfig.kt → ...er/config/LocalServerEnvironmentConfig.kt b/...ar/config/LocalServerEnvironmentConfig.kt → ...er/config/LocalServerEnvironmentConfig.kt
@@ -1,10 +1,9 @@
-package org.worldcubeassociation.tnoodle.deployable.jar.config
+package org.worldcubeassociation.tnoodle.server.config
 
 import org.worldcubeassociation.tnoodle.server.ServerEnvironmentConfig
-import org.worldcubeassociation.tnoodle.deployable.jar.server.WebServerUtils.DEVEL_VERSION
-import org.worldcubeassociation.tnoodle.deployable.jar.server.WebServerUtils.PRUNING_FOLDER
-import org.worldcubeassociation.tnoodle.deployable.jar.server.WebServerUtils
-import org.worldcubeassociation.tnoodle.deployable.jar.server.WebServerUtils.jarFile
+import org.worldcubeassociation.tnoodle.server.config.WebServerUtils.DEVEL_VERSION
+import org.worldcubeassociation.tnoodle.server.config.WebServerUtils.PRUNING_FOLDER
+import org.worldcubeassociation.tnoodle.server.config.WebServerUtils.jarFile
 import java.io.File
 import java.io.FileNotFoundException
 

diff --git a/...e/deployable/jar/server/WebServerUtils.kt → ...n/tnoodle/server/config/WebServerUtils.kt b/...e/deployable/jar/server/WebServerUtils.kt → ...n/tnoodle/server/config/WebServerUtils.kt
@@ -1,4 +1,4 @@
-package org.worldcubeassociation.tnoodle.deployable.jar.server
+package org.worldcubeassociation.tnoodle.server.config
 
 import java.io.*
 import java.net.URISyntaxException