Skip to content

fix: upload archive errors #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 19, 2024
Merged

fix: upload archive errors #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3092503
fix: make TarDirWalker work correctly with directories
devwckd May 19, 2024
7e16a0d
chore: expose apache compress using `api`
devwckd May 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/jvmMain/kotlin/me/devnatan/yoki/io/CompressArchiveUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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()
}
Expand All @@ -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
}

Expand Down