Skip to content

Commit 4f38a6a

Browse files
committed
fix: try catch
1 parent ff3d984 commit 4f38a6a

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

  • src/main/kotlin/io/github/gnuf0rce/mirai/netdisk

src/main/kotlin/io/github/gnuf0rce/mirai/netdisk/NetDisk.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public object NetDisk : BaiduNetDiskClient(config = NetdiskOauthConfig), Listene
4444
val id = NetDiskFileSyncPlugin.permissionId("sync")
4545
val parent = NetDiskFileSyncPlugin.parentPermission
4646
register(id, "百度云文件同步", parent)
47-
} catch (_: Throwable) {
47+
} catch (_: Exception) {
4848
rootPermission
4949
}
5050
}
@@ -59,7 +59,7 @@ public object NetDisk : BaiduNetDiskClient(config = NetdiskOauthConfig), Listene
5959
private val logger: MiraiLogger by lazy {
6060
try {
6161
NetDiskFileSyncPlugin.logger
62-
} catch (_: Throwable) {
62+
} catch (_: Exception) {
6363
MiraiLogger.Factory.create(this::class, "netdisk")
6464
}
6565
}
@@ -134,7 +134,7 @@ public object NetDisk : BaiduNetDiskClient(config = NetdiskOauthConfig), Listene
134134

135135
val rapid = try {
136136
uploadAbsoluteFile(file)
137-
} catch (cause: Throwable) {
137+
} catch (cause: Exception) {
138138
logger.warning({ "上传失败 $file" }, cause)
139139
if (NetdiskUploadConfig.reply) {
140140
subject.sendMessage(message.quote() + "文件 ${file.name} 上传失败, ${cause.message}")
@@ -244,9 +244,9 @@ public object NetDisk : BaiduNetDiskClient(config = NetdiskOauthConfig), Listene
244244
try {
245245
rapid(upload = rapid)
246246
return rapid
247-
} catch (throwable: IllegalArgumentException) {
248-
logger.info { "文件 ${file.name} 秒传失败, 进入文件上传, ${throwable.message}" }
249-
} catch (exception: Throwable) {
247+
} catch (cause: ClientRequestException) {
248+
logger.info { "文件 ${file.name} 秒传失败, 进入文件上传, ${cause.message}" }
249+
} catch (exception: Exception) {
250250
logger.warning({ "文件 ${file.name} 秒传失败, 进入文件上传" }, exception)
251251
}
252252

@@ -261,9 +261,9 @@ public object NetDisk : BaiduNetDiskClient(config = NetdiskOauthConfig), Listene
261261
writeFully(bytes)
262262
}
263263
return rapid
264-
} catch (throwable: ClientRequestException) {
265-
logger.info { "文件 ${file.name} 单文件上传失败, 进入文件上传, ${throwable.message}" }
266-
} catch (exception: Throwable) {
264+
} catch (cause: ClientRequestException) {
265+
logger.info { "文件 ${file.name} 单文件上传失败, 进入文件上传, ${cause.message}" }
266+
} catch (exception: Exception) {
267267
logger.info({ "文件 ${file.name} 单文件上传失败, 进入文件上传" }, exception)
268268
}
269269
}

0 commit comments

Comments
 (0)