Replaced hardcoded separator by OS dependant appropach

This commit is contained in:
Abdelilah El Aissaoui 2022-02-08 19:29:20 +01:00
parent 2a12c3e883
commit 93a1ef3240
3 changed files with 12 additions and 7 deletions

View File

@ -11,7 +11,7 @@ val String.md5: String
val String.dirName: String
get() {
val parts = this.split("/")
val parts = this.split(systemSeparator)
return if (parts.isNotEmpty())
parts.last()
@ -21,11 +21,11 @@ val String.dirName: String
val String.dirPath: String
get() {
val parts = this.split("/").toMutableList()
val parts = this.split(systemSeparator).toMutableList()
return if (parts.count() > 1) {
parts.removeLast()
parts.joinToString("/")
parts.joinToString(systemSeparator)
} else
this
}

View File

@ -0,0 +1,7 @@
package app.extensions
import java.nio.file.FileSystems
val systemSeparator: String by lazy {
FileSystems.getDefault().separator
}

View File

@ -1,6 +1,7 @@
package app.git
import app.TempFilesManager
import app.extensions.systemSeparator
import dagger.assisted.Assisted
import dagger.assisted.AssistedInject
import org.eclipse.jgit.diff.ContentSource
@ -74,13 +75,10 @@ class RawFileManager @AssistedInject constructor(
entry: DiffEntry,
side: DiffEntry.Side
): EntryContent.ImageBinary {
println("Data's size is ${ldr.size}")
val tempDir = tempFilesManager.tempDir
val tempFile = createTempFile(tempDir, prefix = "${entry.newPath.replace("/", "_")}_${side.name}")
val tempFile = createTempFile(tempDir, prefix = "${entry.newPath.replace(systemSeparator, "_")}_${side.name}")
tempFile.toFile().deleteOnExit()
println("Temp file generated: ${tempFile.absolutePathString()}")
val out = FileOutputStream(tempFile.toFile())
out.use {