mirror of
https://github.com/LamGC/ScalaBot.git
synced 2025-04-29 22:27:31 +00:00
fix(utils): 修复 deepListFiles 错误地返回了 null 的情况.
预期中, deepListFiles 返回 null 与否是与 listFiles 相同的, 当 File 无法访问, 或者不是一个目录的情况下才会返回 null, 但由于语法疏漏, 导致可能出现即使 listFiles 返回 null 时 deepListFiles 也不返回 null 的情况. 现已修复该问题.
This commit is contained in:
parent
c41aac735c
commit
f148c21390
@ -25,13 +25,13 @@ internal fun File.deepListFiles(
|
||||
fileFilter: FileFilter? = null,
|
||||
filenameFilter: FilenameFilter? = null
|
||||
): Array<File>? {
|
||||
val files = if (fileFilter != null) {
|
||||
val files = (if (fileFilter != null) {
|
||||
this.listFiles(fileFilter)
|
||||
} else if (filenameFilter != null) {
|
||||
this.listFiles(filenameFilter)
|
||||
} else {
|
||||
this.listFiles()
|
||||
} ?: return null
|
||||
}) ?: return null
|
||||
|
||||
val result = if (addSelf) mutableSetOf(this) else mutableSetOf()
|
||||
for (file in files) {
|
||||
|
Loading…
Reference in New Issue
Block a user