SPC/snark
5
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SNRK-67: Fix pathes

Browse Source
This commit is contained in:
Kirill Grachev 2023-04-24 00:27:24 +03:00
parent 9651ad1cd9
commit 88510dbba8
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
snark-storage-driver/src/main/kotlin/space/kscience/snark/storage/local/localDriver.kt → snark-storage-driver/src/main/kotlin/space/kscience/snark/storage/local/LocalDriver.kt
View File

@ -13,23 +13,29 @@ public class LocalFile(private val path: String) : FileReader, FileWriter {
override suspend fun write(bytes: ByteArray) = File(this.path).writeBytes(bytes) override suspend fun write(bytes: ByteArray) = File(this.path).writeBytes(bytes)
} }
public class LocalDirectory(private val path: String) : Directory { public class LocalDirectory(private val root: String, private val path: String) : Directory {
private val current = "$root/$path"
private fun child(child: String): String = "$current/$child"
override fun close() {} override fun close() {}
override suspend fun get(filename: String): FileReader = LocalFile("${this.path}${File.separator}$filename")
override suspend fun get(filename: String): FileReader = LocalFile(child(filename))
override suspend fun create(filename: String, ignoreIfExists: Boolean) { override suspend fun create(filename: String, ignoreIfExists: Boolean) {
if (!File("${this.path}${File.separator}$filename").createNewFile() && !ignoreIfExists) { if (!File(child(filename)).createNewFile() && !ignoreIfExists) {
throw UnsupportedOperationException("File already exists") throw UnsupportedOperationException("File already exists")
} }
} }
override suspend fun put(filename: String): FileWriter = LocalFile("${this.path}${File.separator}$filename") override suspend fun put(filename: String): FileWriter = LocalFile(child(filename))
override suspend fun getSubdir(dirpath: Path): Directory = LocalDirectory("${this.path}${File.separator}$dirpath") override suspend fun getSubdir(path: Path): Directory = LocalDirectory(root, child(path.toString()))
override suspend fun createSubdir(dirname: String, ignoreIfExists: Boolean): Directory { override suspend fun createSubdir(dirname: String, ignoreIfExists: Boolean): Directory {
if (!File("${this.path}${File.separator}$dirname").mkdir() && !ignoreIfExists) { val dir = child(dirname)
if (!File(dir).mkdir() && !ignoreIfExists) {
throw UnsupportedOperationException("File already exists") throw UnsupportedOperationException("File already exists")
} }
return this.getSubdir(File(dirname).toPath()) return this.getSubdir(File(dir).toPath())
} }
} }