Basic CLI args

Author: jdamcd

.github/workflows/push.yml

@@ -41,7 +41,7 @@ jobs:
       uses: dorny/test-reporter@v1.9.1
       if: always()
       with:
-        name: Kotlin results
+        name: Test results
         path: '**/build/test-results/**/TEST-*.xml'
         reporter: java-junit
         fail-on-error: true

cli/build.gradle.kts

@@ -11,4 +11,5 @@ dependencies {
     implementation(project(":shared"))
     implementation(libs.koin)
     implementation(libs.kotlin.coroutines)
+    implementation(libs.clikt)
 }

cli/src/main/kotlin/com/jdamcd/arrivals/cli/Cli.kt

@@ -1,6 +1,13 @@
 package com.jdamcd.arrivals.cli
 
+import com.github.ajalt.clikt.command.SuspendingCliktCommand
+import com.github.ajalt.clikt.command.main
+import com.github.ajalt.clikt.parameters.options.default
+import com.github.ajalt.clikt.parameters.options.option
+import com.github.ajalt.clikt.parameters.types.choice
 import com.jdamcd.arrivals.Arrivals
+import com.jdamcd.arrivals.Settings
+import com.jdamcd.arrivals.SettingsConfig
 import com.jdamcd.arrivals.initKoin
 import kotlinx.coroutines.runBlocking
 import org.koin.core.component.KoinComponent
@@ -9,18 +16,27 @@ import org.koin.core.component.inject
 fun main(args: Array<String>) {
     initKoin()
     runBlocking {
-        CliApplication().run()
+        Cli().main(args)
     }
 }
 
-class CliApplication : KoinComponent {
+private class Cli :
+    SuspendingCliktCommand("arrivals"),
+    KoinComponent {
     private val arrivals: Arrivals by inject()
+    private val settings: Settings by inject()
+
+    val mode by option().choice("tfl", "gtfs").default("tfl")
+
+    override suspend fun run() {
+        if (mode == "gtfs") {
+            settings.mode = SettingsConfig.MODE_GTFS
+        }
 
-    suspend fun run() {
         val result = arrivals.latest()
-        println(result.station)
+        echo(result.station)
         result.arrivals.forEach {
-            println("%-24s\t%6s".format(it.destination, it.time))
+            echo("%-24s\t%6s".format(it.destination, it.time))
         }
     }
 }

gradle/libs.versions.toml

@@ -11,6 +11,8 @@ okio = "3.9.1"
 koin = "4.0.0"
 mockk = "1.13.14"
 kotest = "5.9.1"
+logging = "2.0.16"
+clikt = "5.0.2"
 
 [libraries]
 ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" }
@@ -24,7 +26,8 @@ kotlin-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime",
 wire-runtime = { group = "com.squareup.wire", name = "wire-runtime", version.ref = "wire" }
 okio = { group = "com.squareup.okio", name = "okio", version.ref = "okio" }
 koin = { group = "io.insert-koin", name = "koin-core", version.ref = "koin" }
-logging-nop = { group = "org.slf4j", name = "slf4j-nop", version = "2.0.16" }
+logging-nop = { group = "org.slf4j", name = "slf4j-nop", version.ref = "logging" }
+clikt = { group = "com.github.ajalt.clikt", name = "clikt", version.ref = "clikt" }
 
 coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
 mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" }

shared/src/commonMain/kotlin/com/jdamcd/arrivals/gtfs/GtfsApi.kt

@@ -56,8 +56,7 @@ internal class GtfsApi(private val client: HttpClient) {
                 val fileToWrite = destination.resolve(relativePath)
                 fileToWrite.createParentDirectories()
                 FileSystem.SYSTEM.sink(fileToWrite).buffer().use { sink ->
-                    val bytes = sink.writeAll(source)
-                    println("Unzipped: $relativePath to $fileToWrite; $bytes bytes written")
+                    sink.writeAll(source)
                 }
             }
         }