Fix loading animations from file with wrong ID

Fix connection trying to send running animations to local connection

Author: maxnz

src/main/java/animatedledstrip/cmdline/CommandLine.kt

@@ -1,6 +1,8 @@
 package animatedledstrip.cmdline
 
 import kotlinx.coroutines.*
+import org.pmw.tinylog.Configurator
+import org.pmw.tinylog.Level
 import java.io.EOFException
 import java.io.ObjectInputStream
 import java.io.ObjectOutputStream
@@ -17,6 +19,10 @@ class CommandLine {
 
     private var readerJob: Job? = null
 
+    init {
+        Configurator.defaultConfig().level(Level.OFF).activate()
+    }
+
     fun loop() {
         println("Welcome to the AnimatedLEDStrip Server console")
         while (!endCmdLine) {

src/main/java/animatedledstrip/server/AnimationHandler.kt

@@ -66,7 +66,7 @@ internal class AnimationHandler(
                 if (!it.isDirectory && it.name.endsWith(".anim")) try {
                     ObjectInputStream(FileInputStream(it)).apply {
                         val obj = readObject() as AnimationData
-                        addAnimation(obj)
+                        addAnimation(obj, obj.id)
                         close()
                     }
                 } catch (e: ClassCastException) {
@@ -91,7 +91,7 @@ internal class AnimationHandler(
      *
      * @param params An AnimationData instance containing data about the animation to be run
      */
-    fun addAnimation(params: AnimationData) {
+    fun addAnimation(params: AnimationData, animId: String? = null) {
 
         /*  Special "Animation" type that the client sends to end an animation */
         if (params.animation == Animation.ENDANIMATION)
@@ -105,7 +105,7 @@ internal class AnimationHandler(
                 /* Animations that can be run repeatedly */
                 false -> {
                     if (params.continuous) {
-                        val id = (random() * 100000000).toInt().toString()
+                        val id = animId ?: (random() * 100000000).toInt().toString()
                         continuousAnimations[id] =
                             ContinuousRunAnimation(id, params, leds, this)
                         Logger.trace(continuousAnimations)

src/main/java/animatedledstrip/server/SocketConnections.kt

@@ -102,19 +102,15 @@ object SocketConnections {
                 while (server.running) {
                     try {
                         clientSocket = serverSocket.accept()
-                        Logger.trace { "Accepted new connection on port $port" }
-                        Logger.trace { "Initializing input stream" }
                         val socIn = ObjectInputStream(clientSocket!!.getInputStream())
-                        Logger.trace { "Initializing output stream" }
                         socOut = ObjectOutputStream(clientSocket!!.getOutputStream())
                         Logger.info { "Connection on port $port Established" }
                         connected = true
-                        Logger.debug { "Sending currently running animations to GUI" }
                         // Send all current running continuous animations to newly connected client
-                        server.animationHandler.continuousAnimations.forEach {
-                            Logger.info { "Sending ${it.value}"}
-                            it.value.sendStartAnimation(this@Connection)
-                        }
+                        if (port != 1118)
+                            server.animationHandler.continuousAnimations.forEach {
+                                it.value.sendStartAnimation(this@Connection)
+                            }
                         var input: Any?
                         while (connected) {
                             Logger.trace { "Waiting for input" }
@@ -190,7 +186,6 @@ object SocketConnections {
                     withTimeout(5000) {
                         withContext(Dispatchers.IO) {
                             socOut?.writeObject(str)
-//                                ?: Logger.debug { "Could not send string $str: Connection socket null" }
                         }
                     }
                 }