diff --git a/src/main/kotlin/app/extensions/StringExtensions.kt b/src/main/kotlin/app/extensions/StringExtensions.kt index 8d2af62..146001e 100644 --- a/src/main/kotlin/app/extensions/StringExtensions.kt +++ b/src/main/kotlin/app/extensions/StringExtensions.kt @@ -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 } diff --git a/src/main/kotlin/app/extensions/SystemUtils.kt b/src/main/kotlin/app/extensions/SystemUtils.kt new file mode 100644 index 0000000..3b217eb --- /dev/null +++ b/src/main/kotlin/app/extensions/SystemUtils.kt @@ -0,0 +1,7 @@ +package app.extensions + +import java.nio.file.FileSystems + +val systemSeparator: String by lazy { + FileSystems.getDefault().separator +} \ No newline at end of file diff --git a/src/main/kotlin/app/git/RawFileManager.kt b/src/main/kotlin/app/git/RawFileManager.kt index 7ba8fff..7230b93 100644 --- a/src/main/kotlin/app/git/RawFileManager.kt +++ b/src/main/kotlin/app/git/RawFileManager.kt @@ -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 {