azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

command line args moved to separate function

Browse Source
This commit is contained in:
MaximZaitsev
2016-07-14 13:18:48 +03:00
parent 63a80fe1c7
commit f510a57fd1
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop_clients/stFlashClient/src/main/java/Main.kt
+15 -11
View File
@@ -12,17 +12,8 @@ import java.io.IOException
*/ */
fun main(args: Array<String>) { fun main(args: Array<String>) {
val jsap: JSAP = JSAP(); val jsap: JSAP = JSAP()
val opthost = FlaggedOption("host").setStringParser(JSAP.STRING_PARSER).setRequired(true).setShortFlag('h').setLongFlag("host") setOptions(jsap)
val optPort = FlaggedOption("port").setStringParser(JSAP.INTEGER_PARSER).setDefault("8888").setRequired(false).setShortFlag('p').setLongFlag("port")
val optBinPath = FlaggedOption("binFile").setStringParser(JSAP.STRING_PARSER).setRequired(true).setShortFlag('f').setLongFlag("binFile")
val optmcuSystem = FlaggedOption("mcuSystem").setStringParser(JSAP.STRING_PARSER).setRequired(false).setDefault("0x08000000").setShortFlag('s')
val optHelp = FlaggedOption("help").setStringParser(JSAP.BOOLEAN_PARSER).setRequired(false).setDefault("false").setLongFlag("help")
jsap.registerParameter(opthost)
jsap.registerParameter(optPort)
jsap.registerParameter(optBinPath)
jsap.registerParameter(optmcuSystem)
jsap.registerParameter(optHelp)
val config = jsap.parse(args) val config = jsap.parse(args)
if (!config.success() || config.getBoolean("help")) { if (!config.success() || config.getBoolean("help")) {
@@ -57,3 +48,16 @@ fun main(args: Array<String>) {
client.Client.sendRequest(request, host, port) client.Client.sendRequest(request, host, port)
println(client.ClientHandler.requestResult.code) println(client.ClientHandler.requestResult.code)
} }
fun setOptions(jsap:JSAP) {
val opthost = FlaggedOption("host").setStringParser(JSAP.STRING_PARSER).setRequired(true).setShortFlag('h').setLongFlag("host")
val optPort = FlaggedOption("port").setStringParser(JSAP.INTEGER_PARSER).setDefault("8888").setRequired(false).setShortFlag('p').setLongFlag("port")
val optBinPath = FlaggedOption("binFile").setStringParser(JSAP.STRING_PARSER).setRequired(true).setShortFlag('f').setLongFlag("binFile")
val optmcuSystem = FlaggedOption("mcuSystem").setStringParser(JSAP.STRING_PARSER).setRequired(false).setDefault("0x08000000").setShortFlag('s')
val optHelp = FlaggedOption("help").setStringParser(JSAP.BOOLEAN_PARSER).setRequired(false).setDefault("false").setLongFlag("help")
jsap.registerParameter(opthost)
jsap.registerParameter(optPort)
jsap.registerParameter(optBinPath)
jsap.registerParameter(optmcuSystem)
jsap.registerParameter(optHelp)
}