Skip to content

Commit 9086f77

Browse files
committed
Fix ImageUnzipper stalling if directory has trailing whitespace
1 parent fab7d0b commit 9086f77

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ targetCompatibility = 1.8
99

1010
/* Application */
1111
group 'nihas101'
12-
version = '1.1.0-SNAPSHOT'
12+
version = '1.1.1-SNAPSHOT'
1313
applicationName = 'jaKoImage2Pdf'
1414
mainClassName = 'de.nihas101.imageToPdfConverter.Main'
1515
archivesBaseName = 'JaKoImage2Pdf'

src/main/kotlin/de/nihas101/imageToPdfConverter/directoryIterators/zipIterators/ImageUnZipper.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class ImageUnZipper private constructor(private val zipInputStream: ZipInputStre
3232
var cancelled = false
3333

3434
fun unzip(unzipInto: File, deleteOnExit: Boolean = false) {
35-
unzip({ zipEntry -> createFile("${unzipInto.absolutePath}/${zipEntry.name}", deleteOnExit) })
35+
unzip({ zipEntry -> createFile("${unzipInto.absolutePath.trim()}/${zipEntry.name.trim()}", deleteOnExit) })
3636
System.gc()
3737
}
3838

src/test/kotlin/de/nihas101/imageToPdfConverter/directoryIterators/zipIterators/ImageUnZipperTest.kt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import org.junit.Test
88
import java.io.File
99

1010
class ImageUnZipperTest {
11-
1211
@Test
1312
fun unzip() {
1413
val unzipInto = File("src/test/resources/zip/images")
@@ -20,6 +19,17 @@ class ImageUnZipperTest {
2019
assertEquals(4, unzipInto.listFiles().size)
2120
}
2221

22+
@Test
23+
fun unzipWithTrailingSpace() {
24+
val unzipInto = File("src/test/resources/zip/images ")
25+
unzipInto.mkdir()
26+
unzipInto.deleteOnExit()
27+
28+
createImageUnZipper(File("src/test/resources/zip/images .zip")).unzip(unzipInto, true)
29+
30+
assertEquals(4, unzipInto.listFiles().size)
31+
}
32+
2333
@Test
2434
fun notSupportedException() {
2535
val unzipInto = File("src/test/resources/zip/images")

src/test/resources/zip/images .zip

1.63 KB
Binary file not shown.

0 commit comments

Comments
 (0)