mirror of https://github.com/hykilpikonna/AquaDX
[+] Add playlog info to battle log when upsert
parent
4c3ed1d0da
commit
01cb0c4b90
|
@ -196,6 +196,7 @@ fun <K, V: Any> Map<K, V?>.vNotNull(): Map<K, V> = filterValues { it != null }.m
|
||||||
fun <T> MutableList<T>.popAll(list: List<T>) = list.also { removeAll(it) }
|
fun <T> MutableList<T>.popAll(list: List<T>) = list.also { removeAll(it) }
|
||||||
fun <T> MutableList<T>.popAll(vararg items: T) = popAll(items.toList())
|
fun <T> MutableList<T>.popAll(vararg items: T) = popAll(items.toList())
|
||||||
inline fun <T> Iterable<T>.mapApply(block: T.() -> Unit) = map { it.apply(block) }
|
inline fun <T> Iterable<T>.mapApply(block: T.() -> Unit) = map { it.apply(block) }
|
||||||
|
inline fun <T> Iterable<T>.mapApplyI(block: T.(Int) -> Unit) = mapIndexed { i, e -> e.apply { block(i) } }
|
||||||
@Suppress("UNCHECKED_CAST")
|
@Suppress("UNCHECKED_CAST")
|
||||||
fun <K, V: Any> Map<K, V?>.recursiveNotNull(): Map<K, V> = mapNotNull { (k, v) ->
|
fun <K, V: Any> Map<K, V?>.recursiveNotNull(): Map<K, V> = mapNotNull { (k, v) ->
|
||||||
k to if (v is Map<*, *>) (v as Map<Any?, Any?>).recursiveNotNull() else v
|
k to if (v is Map<*, *>) (v as Map<Any?, Any?>).recursiveNotNull() else v
|
||||||
|
|
|
@ -71,7 +71,13 @@ fun ChusanController.upsertApiInit() {
|
||||||
|
|
||||||
// Playlog
|
// Playlog
|
||||||
userPlaylogList?.let { db.userPlaylog.saveAll(it) }
|
userPlaylogList?.let { db.userPlaylog.saveAll(it) }
|
||||||
userNetBattlelogList?.let { db.netBattleLog.saveAll(it.mapApply {
|
userNetBattlelogList?.let { db.netBattleLog.saveAll(it.mapApplyI { i ->
|
||||||
|
userPlaylogList?.getOrNull(i)?.let {
|
||||||
|
musicId = it.musicId
|
||||||
|
difficultyId = it.level
|
||||||
|
score = it.score
|
||||||
|
}
|
||||||
|
|
||||||
selectUserName = selectUserName.fromChusanUsername()
|
selectUserName = selectUserName.fromChusanUsername()
|
||||||
opponentUserName1 = opponentUserName1.fromChusanUsername()
|
opponentUserName1 = opponentUserName1.fromChusanUsername()
|
||||||
opponentUserName2 = opponentUserName2.fromChusanUsername()
|
opponentUserName2 = opponentUserName2.fromChusanUsername()
|
||||||
|
|
Loading…
Reference in New Issue