LamGC/ScalaBot
1
0
Fork 0
mirror of https://github.com/LamGC/ScalaBot.git synced 2025-04-29 22:27:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(utils): 修复 deepListFiles 错误地返回了 null 的情况.

Browse Source 
预期中, deepListFiles 返回 null 与否是与 listFiles 相同的, 当 File 无法访问, 或者不是一个目录的情况下才会返回 null,
但由于语法疏漏, 导致可能出现即使 listFiles 返回 null 时 deepListFiles 也不返回 null 的情况.
现已修复该问题.
This commit is contained in:
LamGC 2022-06-19 02:07:24 +08:00
parent c41aac735c
commit f148c21390
Signed by: LamGC
GPG Key ID: 6C5AE2A913941E1D
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scalabot-app/src/main/kotlin/util/Utils.kt
View File

@ -25,13 +25,13 @@ internal fun File.deepListFiles(
fileFilter: FileFilter? = null, fileFilter: FileFilter? = null,
filenameFilter: FilenameFilter? = null filenameFilter: FilenameFilter? = null
): Array<File>? { ): Array<File>? {
val files = if (fileFilter != null) { val files = (if (fileFilter != null) {
this.listFiles(fileFilter) this.listFiles(fileFilter)
} else if (filenameFilter != null) { } else if (filenameFilter != null) {
this.listFiles(filenameFilter) this.listFiles(filenameFilter)
} else { } else {
this.listFiles() this.listFiles()
} ?: return null }) ?: return null
val result = if (addSelf) mutableSetOf(this) else mutableSetOf() val result = if (addSelf) mutableSetOf(this) else mutableSetOf()
for (file in files) { for (file in files) {