github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-05 23:50:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix AbsoluteFileFolder resolving with absolute path

Browse Source
This commit is contained in:
Karlatemp 2021-11-19 21:14:28 +08:00 committed by Him188
parent a97749e736
commit 813d8485b6
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mirai-core/src/commonMain/kotlin/contact/file/AbsoluteFolderImpl.kt
View File

@ -363,6 +363,9 @@ internal class AbsoluteFolderImpl(
override suspend fun resolveFolder(name: String): AbsoluteFolder? {
if (name.isBlank()) throw IllegalArgumentException("folder name cannot be blank.")
if (!FileSystem.isLegal(name)) return null
if (name[0] == '/') {
return root.resolveFolder(name.substring(1))
}
return getItemsFlow().firstOrNull { it.folderInfo?.folderName == name }?.resolve() as AbsoluteFolder?
}
@ -380,6 +383,10 @@ internal class AbsoluteFolderImpl(
if (path.isBlank()) throw IllegalArgumentException("path cannot be blank.")
if (!FileSystem.isLegal(path)) return emptyFlow()
if (path[0] == '/') {
return root.resolveFiles(path.substring(1))
}
if (!path.contains('/')) {
return getItemsFlow().filter { it.fileInfo?.fileName == path }.map { it.resolve() as AbsoluteFile }
}
@ -392,8 +399,14 @@ internal class AbsoluteFolderImpl(
if (path.isBlank()) throw IllegalArgumentException("path cannot be blank.")
if (!FileSystem.isLegal(path)) return Stream.empty()
if (path[0] == '/') {
return root.resolveFilesStream(path.substring(1))
}
if (!path.contains('/')) {
return getItemsSequence().filter { it.fileInfo?.fileName == path }.map { it.resolve() as AbsoluteFile }
return getItemsSequence()
.filter { it.fileInfo?.fileName == path }
.map { it.resolve() as AbsoluteFile }
.asStream()
}
@ -403,6 +416,9 @@ internal class AbsoluteFolderImpl(
override suspend fun resolveAll(path: String): Flow<AbsoluteFileFolder> {
if (path.isBlank()) throw IllegalArgumentException("path cannot be blank.")
if (!FileSystem.isLegal(path)) return emptyFlow()
if (path[0] == '/') {
return root.resolveAll(path.substring(1))
}
if (!path.contains('/')) {
return getItemsFlow().mapNotNull { it.resolve() }
}
@ -414,6 +430,9 @@ internal class AbsoluteFolderImpl(
override suspend fun resolveAllStream(path: String): Stream<AbsoluteFileFolder> {
if (path.isBlank()) throw IllegalArgumentException("path cannot be blank.")
if (!FileSystem.isLegal(path)) return Stream.empty()
if (path[0] == '/') {
return root.resolveAllStream(path.substring(1))
}
if (!path.contains('/')) {
return getItemsSequence().mapNotNull { it.resolve() }.asStream()
}

1
mirai-core/src/commonMain/kotlin/contact/file/AbstractAbsoluteFileFolder.kt
View File

@ -31,6 +31,7 @@ internal fun AbsoluteFolder.impl(): AbsoluteFolderImpl = this.cast()
internal val AbsoluteFolder?.idOrRoot get() = this?.id ?: AbsoluteFolder.ROOT_FOLDER_ID
internal val AbstractAbsoluteFileFolder.parentOrRoot get() = parent ?: contact.files.root
internal val AbstractAbsoluteFileFolder.root get() = contact.files.root
/**
* @see AbsoluteFileFolder