AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-19 12:25:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

CLI: handle execution errors differently from reading errors, hide ParserError stacktrace

Browse Source
This commit is contained in:
Bixilon 2023-01-31 17:17:22 +01:00
parent 95996ccb9d
commit be1ce2aa7d
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/de/bixilon/minosoft/terminal/cli/CLI.kt
View File

@ -1,6 +1,6 @@
/* /*
* Minosoft * Minosoft
* Copyright (C) 2020-2022 Moritz Zwerger * Copyright (C) 2020-2023 Moritz Zwerger
* *
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
* *
@ -19,6 +19,7 @@ import de.bixilon.kutil.observer.DataObserver.Companion.observed
import de.bixilon.kutil.shutdown.AbstractShutdownReason import de.bixilon.kutil.shutdown.AbstractShutdownReason
import de.bixilon.kutil.shutdown.ShutdownManager import de.bixilon.kutil.shutdown.ShutdownManager
import de.bixilon.kutil.string.WhitespaceUtil.trimWhitespaces import de.bixilon.kutil.string.WhitespaceUtil.trimWhitespaces
import de.bixilon.minosoft.commands.errors.ReaderError
import de.bixilon.minosoft.commands.nodes.RootNode import de.bixilon.minosoft.commands.nodes.RootNode
import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
import de.bixilon.minosoft.terminal.commands.Commands import de.bixilon.minosoft.terminal.commands.Commands
@ -71,21 +72,30 @@ object CLI {
while (true) { while (true) {
var line = ""
try { try {
val line: String = reader.readLine().trimWhitespaces() line = reader.readLine().trimWhitespaces()
if (line.isBlank()) {
continue
}
terminal.flush() terminal.flush()
ROOT_NODE.execute(line, connection)
} catch (exception: EndOfFileException) { } catch (exception: EndOfFileException) {
Log.log(LogMessageType.GENERAL, LogLevels.VERBOSE) { exception.printStackTrace() } Log.log(LogMessageType.GENERAL, LogLevels.VERBOSE) { exception.printStackTrace() }
Log.log(LogMessageType.GENERAL, LogLevels.WARN) { "End of file error in cli thread. Disabling cli." } Log.log(LogMessageType.GENERAL, LogLevels.WARN) { "End of file error in cli thread. Disabling cli." }
break break
} catch (exception: UserInterruptException) { } catch (exception: UserInterruptException) {
ShutdownManager.shutdown(reason = AbstractShutdownReason.DEFAULT) ShutdownManager.shutdown(reason = AbstractShutdownReason.DEFAULT)
break
} catch (exception: Throwable) { } catch (exception: Throwable) {
exception.printStackTrace() exception.printStackTrace()
continue
}
try {
if (line.isBlank()) {
continue
}
ROOT_NODE.execute(line, connection)
} catch (error: ReaderError) {
Log.log(LogMessageType.OTHER, LogLevels.WARN) { error.message }
} catch (error: Throwable) {
error.printStackTrace()
} }
} }
} }