azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle, JS] Handle empty directories in task outputs backups

Browse Source 
#KT-52925 Fixed
This commit is contained in:
Alexander Likhachev
2022-07-05 16:27:12 +02:00
committed by Space
parent 10146a7028
commit e3f6ba4502
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/TasksOutputsBackup.kt
+10 -4
View File
@@ -43,7 +43,7 @@ internal class TaskOutputsBackup(
// Kotlin JS compilation task declares one file from 'destinationDirectory' output as task `@OutputFile'
// property. To avoid snapshot sync collisions, each snapshot output directory has also 'index' as prefix.
outputs.toSortedSet().forEachIndexed { index, outputPath ->
if (outputPath.isDirectory && Files.list(outputPath.toPath()).use { it.findFirst().isPresent }) {
if (outputPath.isDirectory && !outputPath.isEmptyDirectory) {
compressDirectoryToZip(
File(snapshotsDir.get().asFile, index.asSnapshotArchiveName),
outputPath
@@ -105,11 +105,14 @@ internal class TaskOutputsBackup(
zip.setLevel(Deflater.NO_COMPRESSION)
outputPath
.walkTopDown()
.filter { !it.isDirectory }
.filter { file -> !file.isDirectory || file.isEmptyDirectory }
.forEach { file ->
val entry = ZipEntry(file.relativeTo(outputPath).invariantSeparatorsPath)
val suffix = if (file.isDirectory) "/" else ""
val entry = ZipEntry(file.relativeTo(outputPath).invariantSeparatorsPath + suffix)
zip.putNextEntry(entry)
file.inputStream().buffered().use { it.copyTo(zip) }
if (!file.isDirectory) {
file.inputStream().buffered().use { it.copyTo(zip) }
}
zip.closeEntry()
}
zip.flush()
@@ -137,6 +140,9 @@ internal class TaskOutputsBackup(
}
}
private val File.isEmptyDirectory: Boolean
get() = !Files.list(toPath()).use { it.findFirst().isPresent }
private val Path.normalizedToBeRelative: String
get() = if (toString() == "/") "." else toString().removePrefix("/")