From a502232e9c44ccb3715da65b857ad540c2a01cb5 Mon Sep 17 00:00:00 2001
From: Brage <bskjon@outlook.com>
Date: Mon, 24 Jul 2023 02:18:17 +0200
Subject: [PATCH] Updated

---
 Encode/build.gradle.kts                       |  5 ++++-
 .../encode/progress/ProgressDecoder.kt        |  2 +-
 .../encode/progress/ProgressDecoderTest.kt    | 20 ++++++++++++++++++-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/Encode/build.gradle.kts b/Encode/build.gradle.kts
index bf4893f4..f196a321 100644
--- a/Encode/build.gradle.kts
+++ b/Encode/build.gradle.kts
@@ -38,8 +38,11 @@ dependencies {
     implementation("org.springframework.kafka:spring-kafka:2.8.5")
 
 
-    testImplementation(platform("org.junit:junit-bom:5.9.1"))
+    testImplementation("junit:junit:4.13.2")
     testImplementation("org.junit.jupiter:junit-jupiter")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
+    testImplementation("org.junit.jupiter:junit-jupiter-params:5.8.1")
+    testImplementation("org.assertj:assertj-core:3.4.1")
 }
 
 tasks.test {
diff --git a/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/progress/ProgressDecoder.kt b/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/progress/ProgressDecoder.kt
index 0abe0471..c52caabd 100644
--- a/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/progress/ProgressDecoder.kt
+++ b/Encode/src/main/kotlin/no/iktdev/streamit/content/encode/progress/ProgressDecoder.kt
@@ -7,7 +7,7 @@ class ProgressDecoder {
         val metadataMap = mutableMapOf<String, String>()
 
         for (line in lines) {
-            val keyValuePairs = line.split(" ")
+            val keyValuePairs = Regex("=\\s*").replace(line, "=").split(" ").filter { it.isNotBlank() }
             for (keyValuePair in keyValuePairs) {
                 val (key, value) = keyValuePair.split("=")
                 metadataMap[key] = value
diff --git a/Encode/src/test/kotlin/no/iktdev/streamit/content/encode/progress/ProgressDecoderTest.kt b/Encode/src/test/kotlin/no/iktdev/streamit/content/encode/progress/ProgressDecoderTest.kt
index a3bb969f..aba5d661 100644
--- a/Encode/src/test/kotlin/no/iktdev/streamit/content/encode/progress/ProgressDecoderTest.kt
+++ b/Encode/src/test/kotlin/no/iktdev/streamit/content/encode/progress/ProgressDecoderTest.kt
@@ -1,10 +1,28 @@
 package no.iktdev.streamit.content.encode.progress
 
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertDoesNotThrow
+
 class ProgressDecoderTest {
 
+    @Test
+    fun test() {
+        val progress = ProgressDecoder()
+        val lines = text.split("\n")
+        val cache: MutableList<String> = mutableListOf()
+        lines.forEach {
+            cache.add(it)
+            assertDoesNotThrow {
+                val progressItem =  progress.parseVideoProgress(cache)
+                progressItem?.progress
+            }
+        }
+        assertThat(lines).isNotEmpty()
+    }
 
     val text = """
-        frame=16811 fps= 88 q=40.0 size=    9984kB time=00:01:10.79 bitrate=1155.3kbits/s speed=3.71x
+        frame=16811 fps= 88 q=40.0 size=    9984kB time=00:x01:10.79 bitrate=1155.3kbits/s speed=3.71x
         fps=88.03
         stream_0_0_q=40.0
         bitrate=1155.3kbits/s