Update blind parsing code

dev
Laurent 7 years ago
parent ddf96cc77a
commit 1deb7d4d46
  1. 11
      app/src/main/java/net/pokeranalytics/android/util/csv/SessionCSVDescriptor.kt
  2. 10
      app/src/main/java/net/pokeranalytics/android/util/csv/TypedField.kt

@ -10,7 +10,6 @@ import net.pokeranalytics.android.model.utils.SessionUtils
import net.pokeranalytics.android.util.extensions.getOrCreate import net.pokeranalytics.android.util.extensions.getOrCreate
import net.pokeranalytics.android.util.extensions.setHourMinutes import net.pokeranalytics.android.util.extensions.setHourMinutes
import org.apache.commons.csv.CSVRecord import org.apache.commons.csv.CSVRecord
import timber.log.Timber
import java.util.* import java.util.*
sealed class SessionField { sealed class SessionField {
@ -254,13 +253,9 @@ class SessionCSVDescriptor(source: DataSource, private var isTournament: Boolean
is SessionField.LimitType -> session.limit = Limit.getInstance(value)?.ordinal is SessionField.LimitType -> session.limit = Limit.getInstance(value)?.ordinal
is SessionField.Comment -> session.comment = value is SessionField.Comment -> session.comment = value
is SessionField.Blind -> { // 1/2 is SessionField.Blind -> { // 1/2
val strBlinds = value.split("/") val blinds = field.parse(value)
if (strBlinds.size > 1) { session.cgSmallBlind = blinds?.first
session.cgBigBlind = strBlinds.last().toDouble() session.cgBigBlind = blinds?.second
session.cgSmallBlind = strBlinds[strBlinds.size - 2].toDouble()
} else {
Timber.d("Blinds could not be parsed: $value")
}
} }
is SessionField.SmallBlind -> session.cgSmallBlind = field.parse(value) is SessionField.SmallBlind -> session.cgSmallBlind = field.parse(value)
is SessionField.BigBlind -> session.cgBigBlind = field.parse(value) is SessionField.BigBlind -> session.cgBigBlind = field.parse(value)

@ -53,6 +53,16 @@ interface BlindField : TypedField<Pair<Double, Double>> {
this.callback?.let { cb -> this.callback?.let { cb ->
return cb(value) return cb(value)
} }
val strBlinds = value.split("/")
if (strBlinds.size == 2) {
val bb = strBlinds.last().toDouble()
val sb = strBlinds.first().toDouble()
return Pair(sb, bb)
} else {
Timber.d("Blinds could not be parsed: $value")
}
return null return null
} }

Loading…
Cancel
Save