Add support for trailing / in UrlOrLocalPath

icpc · Mar 16, 2024 · 66dd417 · 66dd417
1 parent 49000f2
commit 66dd417
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/cds/core/src/main/kotlin/org/icpclive/cds/settings/UrlOrLocalPath.kt b/src/cds/core/src/main/kotlin/org/icpclive/cds/settings/UrlOrLocalPath.kt
@@ -5,7 +5,7 @@ import java.nio.file.Path
 public sealed class UrlOrLocalPath {
     public abstract fun subDir(s: String): UrlOrLocalPath
     public class Url(public val value: String) : UrlOrLocalPath() {
-        public override fun subDir(s: String): UrlOrLocalPath = Url("$value/$s")
+        public override fun subDir(s: String): UrlOrLocalPath = Url("${value.removeSuffix("/")}/$s")
         override fun toString(): String = value
     }
 

diff --git a/src/cds/ktor/src/main/kotlin/org/icpclive/cds/ktor/LineStreamLoader.kt b/src/cds/ktor/src/main/kotlin/org/icpclive/cds/ktor/LineStreamLoader.kt
@@ -21,7 +21,7 @@ public fun getLineStreamLoaderFlow(networkSettings: NetworkSettings?, auth: Clie
 
         is UrlOrLocalPath.Url -> {
             val httpClient = defaultHttpClient(auth, networkSettings)
-            logger.debug("Requesting $url")
+            logger.info("Requesting $url")
             httpClient.prepareGet(url.value) {
                 timeout {
                     socketTimeoutMillis = Long.MAX_VALUE