Skip to content

Commit 8656808

Browse files
committed
Update season name parsing and fix TrueSkill importing
1 parent e58e6d7 commit 8656808

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ android {
1515
applicationId = "com.sunkensplashstudios.VRCRoboScout"
1616
minSdk = 30
1717
targetSdk = 34
18-
versionCode = 9
19-
versionName = "1.1.5"
18+
versionCode = 10
19+
versionName = "1.1.6"
2020

2121
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2222
vectorDrawables {

app/src/main/java/com/sunkensplashstudios/VRCRoboScout/RoboScoutAPI.kt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class VDAEntry : MutableState<VDAEntry> {
115115
@SerialName("ts_ranking_region") var tsRankingRegion: Int = 0
116116
@SerialName("team_link") var teamLink: String = ""
117117
@SerialName("team_number") var teamNumber: String = ""
118-
@SerialName("team_name") var teamName: String = ""
118+
@SerialName("team_name") var teamName: String? = ""
119119
var id: Double = 0.0
120120
var grade: String? = ""
121121
@SerialName("event_region") var eventRegion: String = ""
@@ -441,6 +441,12 @@ class RoboScoutAPI {
441441
val json = Json.parseToJsonElement(response.bodyAsText())
442442

443443
json.jsonArray.forEach { element ->
444+
445+
// Skip teams with no data
446+
if (element.jsonObject["ts_ranking"]?.jsonPrimitive?.int == 99999) {
447+
return@forEach
448+
}
449+
444450
val vdaEntry: VDAEntry = jsonWorker.decodeFromJsonElement(element)
445451
this.vdaCache.add(vdaEntry)
446452
}
@@ -527,7 +533,7 @@ class Program {
527533
class Season {
528534
var id: Int = 0
529535
var name: String = ""
530-
@kotlinx.serialization.Transient var shortName: String = name.replace("VRC ", "").replace("V5RC ", "").replace("VEXU ", "").replace("VURC ", "")
536+
@kotlinx.serialization.Transient var shortName: String = name.replace("VRC ", "").replace("V5RC ", "").replace("VEX V5 ", "").replace("VEXU ", "").replace("VURC ", "").replace("VEX U ", "").replace("Robotics Competition ", "")
531537
var program: Program = Program()
532538
var start: String = ""
533539
var end: String = ""
@@ -778,6 +784,7 @@ class Event {
778784
this.id = event.id
779785
this.sku = event.sku
780786
this.name = event.name
787+
this.name = event.name
781788
this.start = event.start
782789
this.startDate = RoboScoutAPI.roboteventsDate(event.start, true)
783790
this.end = event.end

0 commit comments

Comments
 (0)