TySS-Dev/capod
1
0
Fork 0
mirror of https://github.com/d4rken-org/capod.git synced 2026-09-14 18:26:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve sorting

Browse Source
This commit is contained in:
darken
2022-01-27 00:46:06 +01:00
parent 3be7d8b43f
commit 90fc2fac24
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt
+21 -13
View File
@@ -4,6 +4,7 @@ import eu.darken.capod.common.bluetooth.BleScanner
import eu.darken.capod.common.bluetooth.BluetoothManager2
import eu.darken.capod.common.coroutine.AppScope
import eu.darken.capod.common.debug.logging.Logging.Priority.*
import eu.darken.capod.common.debug.logging.asLog
import eu.darken.capod.common.debug.logging.log
import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.common.flow.replayingShare
@@ -83,24 +84,31 @@ class PodMonitor @Inject constructor(
val now = Instant.now()
val minimumSignalQuality = generalSettings.minimumSignalQuality.value
val mainDeviceModel = generalSettings.mainDeviceModel.value
val aboveTresholdSorted = pods.values
.filter { it.signalQuality > minimumSignalQuality }
.sortedWith(
compareBy<PodDevice> { Duration.between(it.lastSeenAt, now) }.thenByDescending { it.rssi }
compareByDescending<PodDevice> { it.model == mainDeviceModel && it.model != PodDevice.Model.UNKNOWN }
.thenBy {
val age = Duration.between(it.lastSeenAt, now).seconds
if (age < 3) 0L else age
}
.thenByDescending { it.signalQuality }
)
val belowThresholdSorted = pods.values
.filter { it.signalQuality <= minimumSignalQuality }
.sortedWith(
compareBy<PodDevice> { Duration.between(it.lastSeenAt, now) }.thenByDescending { it.rssi }
compareBy<PodDevice> { Duration.between(it.lastSeenAt, now) }.thenByDescending { it.signalQuality }
)
val main = pods.values.determineMainDevice()
(aboveTresholdSorted + belowThresholdSorted).sortedByDescending { it == main }
val presorted = (aboveTresholdSorted + belowThresholdSorted)
val main = presorted.determineMainDevice()
presorted.sortedByDescending { it == main }
}
.onStart { emit(emptyList()) }
.retryWhen { cause, attempt ->
log(TAG, WARN) { "PodMonitor failed (attempt=$attempt), will retry: $cause" }
log(TAG, WARN) { "PodMonitor failed (attempt=$attempt), will retry: ${cause.asLog()}" }
delay(3000)
true
}
@@ -111,15 +119,15 @@ class PodMonitor @Inject constructor(
.map { it.determineMainDevice() }
.replayingShare(appScope)
private fun Collection<PodDevice>.determineMainDevice(): PodDevice? =
firstOrNull()?.let filter@{ device ->
val minimumSignalQuality = generalSettings.minimumSignalQuality.value
generalSettings.mainDeviceModel.value.let {
if (device.model != it && it != PodDevice.Model.UNKNOWN) return@filter null
private fun List<PodDevice>.determineMainDevice(): PodDevice? =
this.firstOrNull()?.let {
val mainDeviceModel = generalSettings.mainDeviceModel.value
when {
it.model == PodDevice.Model.UNKNOWN -> null
mainDeviceModel != PodDevice.Model.UNKNOWN && it.model != mainDeviceModel -> null
it.signalQuality <= generalSettings.minimumSignalQuality.value -> null
else -> it
}
if (device.signalQuality > minimumSignalQuality) device else null
}
companion object {
app/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt
+1 -1
View File
@@ -119,7 +119,7 @@ interface ApplePods : PodDevice {
rssiHistory = recognizedDevice.rssiHistory
.toMutableList()
.let {
if (it.size > 2) it.removeAt(0)
if (it.size > 3) it.removeAt(0)
it.plus(scanResult.rssi)
}
)