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

SNRK-57: Format file

Browse Source
This commit is contained in:
Kirill Grachev 2023-04-28 17:07:54 +03:00
parent 52772cde7d
commit f71e5a3f1a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
snark-storage-driver/src/main/kotlin/space/kscience/snark/storage/s3/S3Directory.kt
View File

@ -17,7 +17,7 @@ internal class S3Directory(
override suspend fun create(filename: String, ignoreIfExists: Boolean) { override suspend fun create(filename: String, ignoreIfExists: Boolean) {
if (!ignoreIfExists) { if (!ignoreIfExists) {
throw IllegalArgumentException("could not check if file exists") TODO("could not check if file exists")
} }
} }

12
snark-storage-driver/src/main/kotlin/space/kscience/snark/storage/s3/S3Root.kt
View File

@ -17,8 +17,8 @@ public fun s3Bucket(client: S3Client, bucket: String): Directory =
internal fun splitPathIntoBucketAndPath(path: Path): Pair<String, Path> { internal fun splitPathIntoBucketAndPath(path: Path): Pair<String, Path> {
val bucket = path.getName(0) val bucket = path.getName(0)
val recent = path.relativize(bucket) val filePath = path.relativize(bucket)
return Pair(bucket.toString(), recent) return Pair(bucket.toString(), filePath)
} }
internal class S3Root(private val client: S3Client) : Directory { internal class S3Root(private val client: S3Client) : Directory {
@ -35,21 +35,21 @@ internal class S3Root(private val client: S3Client) : Directory {
} }
override suspend fun getSubdir(path: Path): Directory = try { override suspend fun getSubdir(path: Path): Directory = try {
val (bucketName, recentPath) = splitPathIntoBucketAndPath(path) val (bucketName, filePath) = splitPathIntoBucketAndPath(path)
client.headBucket { client.headBucket {
bucket = bucketName bucket = bucketName
} }
S3Directory(client, bucketName, recentPath) S3Directory(client, bucketName, filePath)
} catch (ex: Exception) { } catch (ex: Exception) {
throw AccessDeniedException(path.toFile(), reason = ex.message) throw AccessDeniedException(path.toFile(), reason = ex.message)
} }
override suspend fun createSubdir(dirname: String, ignoreIfExists: Boolean): Directory = try { override suspend fun createSubdir(dirname: String, ignoreIfExists: Boolean): Directory = try {
val (bucketName, recentPath) = splitPathIntoBucketAndPath(Path(dirname)) val (bucketName, filePath) = splitPathIntoBucketAndPath(Path(dirname))
client.createBucket { client.createBucket {
bucket = bucketName bucket = bucketName
} }
S3Directory(client, bucketName, recentPath) S3Directory(client, bucketName, filePath)
} catch (ex: Exception) { } catch (ex: Exception) {
throw AccessDeniedException(File(dirname), reason = ex.message) throw AccessDeniedException(File(dirname), reason = ex.message)
} }