Downloading improvements
parent
6e8a1cd6af
commit
85da41be9a
GPG Key ID:
676DEE768C17A9D7
@ -0,0 +1,94 @@
|
||||
package org.koitharu.kotatsu.core.util.progress
|
||||
|
||||
import android.os.SystemClock
|
||||
import androidx.annotation.AnyThread
|
||||
import androidx.collection.CircularArray
|
||||
import java.util.concurrent.TimeUnit
|
||||
import kotlin.math.roundToLong
|
||||
|
||||
class RealtimeEtaEstimator {
|
||||
|
||||
private val ticks = CircularArray<Tick>(MAX_TICKS)
|
||||
|
||||
@Volatile
|
||||
private var lastChange = 0L
|
||||
|
||||
@AnyThread
|
||||
fun onProgressChanged(value: Int, total: Int) {
|
||||
if (total <= 0 || value > total) {
|
||||
reset()
|
||||
return
|
||||
}
|
||||
val tick = Tick(value, total, SystemClock.elapsedRealtime())
|
||||
synchronized(this) {
|
||||
if (!ticks.isEmpty()) {
|
||||
val last = ticks.last
|
||||
if (last.value == tick.value && last.total == tick.total) {
|
||||
ticks.popLast()
|
||||
} else {
|
||||
lastChange = tick.timestamp
|
||||
}
|
||||
} else {
|
||||
lastChange = tick.timestamp
|
||||
}
|
||||
ticks.addLast(tick)
|
||||
}
|
||||
}
|
||||
|
||||
@AnyThread
|
||||
fun reset() = synchronized(this) {
|
||||
ticks.clear()
|
||||
lastChange = 0L
|
||||
}
|
||||
|
||||
@AnyThread
|
||||
fun getEta(): Long {
|
||||
val etl = getEstimatedTimeLeft()
|
||||
return if (etl == NO_TIME || etl > MAX_TIME) NO_TIME else System.currentTimeMillis() + etl
|
||||
}
|
||||
|
||||
@AnyThread
|
||||
fun isStuck(): Boolean = synchronized(this) {
|
||||
return ticks.size() >= MIN_ESTIMATE_TICKS && (SystemClock.elapsedRealtime() - lastChange) > STUCK_DELAY
|
||||
}
|
||||
|
||||
private fun getEstimatedTimeLeft(): Long = synchronized(this) {
|
||||
val ticksCount = ticks.size()
|
||||
if (ticksCount < MIN_ESTIMATE_TICKS) {
|
||||
return NO_TIME
|
||||
}
|
||||
val percentDiff = ticks.last.percent - ticks.first.percent
|
||||
val timeDiff = ticks.last.timestamp - ticks.first.timestamp
|
||||
if (percentDiff <= 0 || timeDiff <= 0) {
|
||||
return NO_TIME
|
||||
}
|
||||
val averageTime = timeDiff / percentDiff
|
||||
val percentLeft = 1.0 - ticks.last.percent
|
||||
return (percentLeft * averageTime).roundToLong()
|
||||
}
|
||||
|
||||
private class Tick(
|
||||
@JvmField val value: Int,
|
||||
@JvmField val total: Int,
|
||||
@JvmField val timestamp: Long,
|
||||
) {
|
||||
|
||||
init {
|
||||
require(total > 0) { "total = $total" }
|
||||
require(value >= 0) { "value = $value" }
|
||||
require(value <= total) { "total = $total, value = $value" }
|
||||
}
|
||||
|
||||
@JvmField
|
||||
val percent = value.toDouble() / total.toDouble()
|
||||
}
|
||||
|
||||
private companion object {
|
||||
|
||||
const val MAX_TICKS = 20
|
||||
const val MIN_ESTIMATE_TICKS = 4
|
||||
const val NO_TIME = -1L
|
||||
const val STUCK_DELAY = 10_000L
|
||||
val MAX_TIME = TimeUnit.DAYS.toMillis(1)
|
||||
}
|
||||
}
|
||||
@ -1,69 +0,0 @@
|
||||
package org.koitharu.kotatsu.core.util.progress
|
||||
|
||||
import android.os.SystemClock
|
||||
import androidx.collection.IntList
|
||||
import androidx.collection.MutableIntList
|
||||
import java.util.concurrent.TimeUnit
|
||||
import kotlin.math.roundToInt
|
||||
import kotlin.math.roundToLong
|
||||
|
||||
private const val MIN_ESTIMATE_TICKS = 4
|
||||
private const val NO_TIME = -1L
|
||||
|
||||
class TimeLeftEstimator {
|
||||
|
||||
private var times = MutableIntList()
|
||||
private var lastTick: Tick? = null
|
||||
private val tooLargeTime = TimeUnit.DAYS.toMillis(1)
|
||||
|
||||
fun tick(value: Int, total: Int) {
|
||||
if (total < 0) {
|
||||
emptyTick()
|
||||
return
|
||||
}
|
||||
if (lastTick?.value == value) {
|
||||
return
|
||||
}
|
||||
val tick = Tick(value, total, SystemClock.elapsedRealtime())
|
||||
lastTick?.let {
|
||||
val ticksCount = value - it.value
|
||||
times.add(((tick.time - it.time) / ticksCount.toDouble()).roundToInt())
|
||||
}
|
||||
lastTick = tick
|
||||
}
|
||||
|
||||
fun emptyTick() {
|
||||
lastTick = null
|
||||
}
|
||||
|
||||
fun getEstimatedTimeLeft(): Long {
|
||||
val progress = lastTick ?: return NO_TIME
|
||||
if (times.size < MIN_ESTIMATE_TICKS) {
|
||||
return NO_TIME
|
||||
}
|
||||
val timePerTick = times.average()
|
||||
val ticksLeft = progress.total - progress.value
|
||||
val eta = (ticksLeft * timePerTick).roundToLong()
|
||||
return if (eta < tooLargeTime) eta else NO_TIME
|
||||
}
|
||||
|
||||
fun getEta(): Long {
|
||||
val etl = getEstimatedTimeLeft()
|
||||
return if (etl == NO_TIME) NO_TIME else System.currentTimeMillis() + etl
|
||||
}
|
||||
|
||||
private fun IntList.average(): Double {
|
||||
if (isEmpty()) {
|
||||
return 0.0
|
||||
}
|
||||
var acc = 0L
|
||||
forEach { acc += it }
|
||||
return acc / size.toDouble()
|
||||
}
|
||||
|
||||
private class Tick(
|
||||
@JvmField val value: Int,
|
||||
@JvmField val total: Int,
|
||||
@JvmField val time: Long,
|
||||
)
|
||||
}
|
||||
@ -0,0 +1,8 @@
|
||||
package org.koitharu.kotatsu.download.domain
|
||||
|
||||
data class DownloadProgress(
|
||||
val totalChapters: Int,
|
||||
val currentChapter: Int,
|
||||
val totalPages: Int,
|
||||
val currentPage: Int,
|
||||
)
|
||||
@ -0,0 +1,9 @@
|
||||
package org.koitharu.kotatsu.local.domain
|
||||
|
||||
import org.koitharu.kotatsu.core.util.MultiMutex
|
||||
import org.koitharu.kotatsu.parsers.model.Manga
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Singleton
|
||||
|
||||
@Singleton
|
||||
class MangaLock @Inject constructor() : MultiMutex<Manga>()
|
||||
@ -0,0 +1,17 @@
|
||||
<vector
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:tint="?colorControlNormal"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M12,5V2L8,6l4,4V7c3.31,0 6,2.69 6,6c0,2.97 -2.17,5.43 -5,5.91v2.02c3.95,-0.49 7,-3.85 7,-7.93C20,8.58 16.42,5 12,5z" />
|
||||
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M6,13c0,-1.65 0.67,-3.15 1.76,-4.24L6.34,7.34C4.9,8.79 4,10.79 4,13c0,4.08 3.05,7.44 7,7.93v-2.02C8.17,18.43 6,15.97 6,13z" />
|
||||
|
||||
</vector>
|
||||
Loading…
Reference in New Issue