fix(watermarker): fix single watermark insertion and extraction (#163)

FraunhoferISST · Dec 2, 2024 · caa84ae · caa84ae
1 parent 9e6fb05
commit caa84ae
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/watermarker/src/commonMain/kotlin/fileWatermarker/TextWatermarker.kt b/watermarker/src/commonMain/kotlin/fileWatermarker/TextWatermarker.kt
@@ -183,9 +183,9 @@ class TextWatermarker(
         file.content = result.toString()
 
         // Check if watermark fits at least one time into the text file with given positioning
-        if (insertPositions.count() < separatedWatermark.count()) {
+        if (insertPositions.count() < getMinimumInsertPositions(watermark)) {
             return OversizedWatermarkWarning(
-                separatedWatermark.count(),
+                getMinimumInsertPositions(watermark),
                 insertPositions.count(),
             ).into()
         }
@@ -228,7 +228,9 @@ class TextWatermarker(
                     sequence {
                         var lastSeparatorPosition = 0
                         for (separatorPosition in separatorPositions) {
-                            yield(lastSeparatorPosition to separatorPosition - 1)
+                            if (lastSeparatorPosition != separatorPosition - 1) {
+                                yield(lastSeparatorPosition to separatorPosition - 1)
+                            }
                             lastSeparatorPosition = separatorPosition + 1
                         }
                     }
@@ -326,7 +328,11 @@ class TextWatermarker(
     @JsName("getMinimumInsertPositionsBytes")
     fun getMinimumInsertPositions(watermark: List<Byte>): Int {
         val separatedWatermark = getSeparatedWatermark(watermark)
-        return separatedWatermark.count()
+        return if (separatorStrategy is SeparatorStrategy.StartEndSeparatorChars) {
+            separatedWatermark.count()
+        } else {
+            separatedWatermark.count() + 1
+        }
     }
 
     /** Counts the minimum number of insert positions needed in a text to insert the [watermark] */

diff --git a/watermarker/src/commonTest/kotlin/unitTest/WatermarkerTest.kt b/watermarker/src/commonTest/kotlin/unitTest/WatermarkerTest.kt
@@ -94,7 +94,7 @@ class WatermarkerTest {
     fun textAddWatermark_watermarkTooLong_warningAndWatermarkedString() {
         // Arrange
         val watermark = "Hello, world!".encodeToByteArray().asList()
-        val expectedMessage = TextWatermarker.OversizedWatermarkWarning(53, 49).into().toString()
+        val expectedMessage = TextWatermarker.OversizedWatermarkWarning(54, 49).into().toString()
         val expected =
             "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temp" +
                 "or invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero " +
@@ -169,18 +169,18 @@ class WatermarkerTest {
     }
 
     @Test
-    fun textGetWatermarks_exactlyOneWatermark_successAndWatermark() {
+    fun textGetWatermarks_exactlyOneWatermark_warningAndWatermark() {
         // Arrange
         val expected =
             listOf(
-                Watermark.fromString("a"),
+                Watermark(listOf(0, 97)),
             )
 
         // Act
         val result = watermarker.textGetWatermarks("a a a a a a a a a a")
 
         // Assert
-        assertTrue(result.isSuccess)
+        assertTrue(result.isWarning)
         assertEquals(expected, result.value)
     }
 

diff --git a/watermarker/src/jvmTest/kotlin/unitTest/fileWatermarker/TextWatermarkerTestJvm.kt b/watermarker/src/jvmTest/kotlin/unitTest/fileWatermarker/TextWatermarkerTestJvm.kt
@@ -62,7 +62,7 @@ class TextWatermarkerTestJvm {
         // Arrange
         val file = openTextFile("src/jvmTest/resources/lorem_ipsum.txt")
         val watermark = Watermark.fromString("This is a watermark that does not fit")
-        val expectedMessage = TextWatermarker.OversizedWatermarkWarning(149, 96).into().toString()
+        val expectedMessage = TextWatermarker.OversizedWatermarkWarning(150, 96).into().toString()
 
         // Act
         val result = textWatermarker.addWatermark(file, watermark)