From 3368818ca13d68db63a717b533c8ea14e63be8f5 Mon Sep 17 00:00:00 2001 From: Graham Date: Fri, 29 Oct 2021 18:16:05 +0100 Subject: [PATCH] Download names from Polar's fork of RuneStar Signed-off-by: Graham --- .../archive/name/RuneStarNameDownloader.kt | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/archive/src/main/kotlin/org/openrs2/archive/name/RuneStarNameDownloader.kt b/archive/src/main/kotlin/org/openrs2/archive/name/RuneStarNameDownloader.kt index e28fb53d..a9a52196 100644 --- a/archive/src/main/kotlin/org/openrs2/archive/name/RuneStarNameDownloader.kt +++ b/archive/src/main/kotlin/org/openrs2/archive/name/RuneStarNameDownloader.kt @@ -16,9 +16,17 @@ public class RuneStarNameDownloader @Inject constructor( private val client: HttpClient ) : NameDownloader { override suspend fun download(): Sequence { - val names = readTsv(NAMES_ENDPOINT, 4) - val individualNames = readTsv(INDIVIDUAL_NAMES_ENDPOINT, 0) - return names + individualNames + val names = mutableSetOf() + + for (endpoint in NAMES_ENDPOINTS) { + names += readTsv(endpoint, 4) + } + + for (endpoint in INDIVIDUAL_NAMES_ENDPOINTS) { + names += readTsv(endpoint, 0) + } + + return names.asSequence() } private suspend fun readTsv(uri: URI, column: Int): Sequence { @@ -39,8 +47,13 @@ public class RuneStarNameDownloader @Inject constructor( } private companion object { - private val NAMES_ENDPOINT = URI("https://raw.githubusercontent.com/RuneStar/cache-names/master/names.tsv") - private val INDIVIDUAL_NAMES_ENDPOINT = - URI("https://raw.githubusercontent.com/RuneStar/cache-names/master/individual-names.tsv") + private val NAMES_ENDPOINTS = listOf( + URI("https://raw.githubusercontent.com/RuneStar/cache-names/master/names.tsv"), + URI("https://raw.githubusercontent.com/Joshua-F/cache-names/master/names.tsv"), + ) + private val INDIVIDUAL_NAMES_ENDPOINTS = listOf( + URI("https://raw.githubusercontent.com/RuneStar/cache-names/master/individual-names.tsv"), + URI("https://raw.githubusercontent.com/Joshua-F/cache-names/master/individual-names.tsv"), + ) } }