From 3092503039f2588cd8197046f77ee7577048211b Mon Sep 17 00:00:00 2001 From: devwckd Date: Sun, 19 May 2024 16:27:42 -0300 Subject: [PATCH 1/2] fix: make TarDirWalker work correctly with directories --- .../kotlin/me/devnatan/yoki/io/CompressArchiveUtil.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/jvmMain/kotlin/me/devnatan/yoki/io/CompressArchiveUtil.kt b/src/jvmMain/kotlin/me/devnatan/yoki/io/CompressArchiveUtil.kt index 4b70c63..2f5028a 100644 --- a/src/jvmMain/kotlin/me/devnatan/yoki/io/CompressArchiveUtil.kt +++ b/src/jvmMain/kotlin/me/devnatan/yoki/io/CompressArchiveUtil.kt @@ -11,7 +11,7 @@ import java.nio.file.Files import java.nio.file.Path import java.nio.file.SimpleFileVisitor import java.nio.file.attribute.BasicFileAttributes -import kotlin.io.path.pathString +import kotlin.io.path.name import kotlin.io.path.relativeTo internal object CompressArchiveUtil { @@ -73,7 +73,7 @@ internal object CompressArchiveUtil { override fun preVisitDirectory(dir: Path, attrs: BasicFileAttributes): FileVisitResult { if (dir != basePath) { tarArchiveOutputStream.putArchiveEntry( - TarArchiveEntry(dir.relativeTo(basePath)), + TarArchiveEntry(dir.toFile(), dir.relativeTo(basePath).fileName.name), ) tarArchiveOutputStream.closeArchiveEntry() } @@ -82,7 +82,7 @@ internal object CompressArchiveUtil { @Throws(IOException::class) override fun visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult { - addFileToTar(tarArchiveOutputStream, file, file.relativize(basePath).pathString) + addFileToTar(tarArchiveOutputStream, file, file.relativeTo(basePath).toString()) return FileVisitResult.CONTINUE } From 7e16a0dd3acc02b2d631eb7261b350825660e7a4 Mon Sep 17 00:00:00 2001 From: devwckd Date: Sun, 19 May 2024 16:28:25 -0300 Subject: [PATCH 2/2] chore: expose apache compress using `api` --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 5b92b39..09c4525 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -71,7 +71,7 @@ kotlin { implementation(libs.junixsocket.common) implementation(libs.ktor.client.engine.okhttp) implementation(libs.slf4j.api) - implementation(libs.apache.compress) + api(libs.apache.compress) } }