mirror of
https://github.com/libre-tube/LibreTube.git
synced 2025-04-27 07:20:30 +05:30
Merge pull request #7214 from FineFindus/feat/increase-batch-size
perf(LocalFeedRepository): speed up local feed extraction
This commit is contained in:
commit
e1b286d1e9
@ -82,31 +82,32 @@ class LocalFeedRepository : FeedRepository {
|
||||
if (channelIds.isEmpty()) return
|
||||
|
||||
val totalExtractionCount = AtomicInteger()
|
||||
val chunkedExtractionCount = AtomicInteger()
|
||||
val channelExtractionCount = AtomicInteger()
|
||||
withContext(Dispatchers.Main) {
|
||||
onProgressUpdate(FeedProgress(0, channelIds.size))
|
||||
}
|
||||
|
||||
for (channelIdChunk in channelIds.chunked(CHUNK_SIZE)) {
|
||||
// add a delay after each BATCH_SIZE amount of visited channels
|
||||
val count = chunkedExtractionCount.get();
|
||||
val count = channelExtractionCount.get();
|
||||
if (count >= BATCH_SIZE) {
|
||||
delay(BATCH_DELAY.random())
|
||||
chunkedExtractionCount.set(0)
|
||||
// add a delay after each BATCH_SIZE amount of fully-fetched channels
|
||||
delay(CHANNEL_BATCH_DELAY.random())
|
||||
channelExtractionCount.set(0)
|
||||
}
|
||||
|
||||
val collectedFeedItems = channelIdChunk.parallelMap { channelId ->
|
||||
try {
|
||||
getRelatedStreams(channelId, minimumDateMillis)
|
||||
getRelatedStreams(channelId, minimumDateMillis).also {
|
||||
if (it.isNotEmpty())
|
||||
// increase counter if we had to fully fetch the channel
|
||||
channelExtractionCount.incrementAndGet()
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
Log.e(channelId, e.stackTraceToString())
|
||||
null
|
||||
} finally {
|
||||
chunkedExtractionCount.incrementAndGet()
|
||||
val currentProgress = totalExtractionCount.incrementAndGet()
|
||||
|
||||
withContext(Dispatchers.Main) {
|
||||
onProgressUpdate(FeedProgress(currentProgress, channelIds.size))
|
||||
onProgressUpdate(FeedProgress(totalExtractionCount.incrementAndGet(), channelIds.size))
|
||||
}
|
||||
}
|
||||
}.filterNotNull().flatten().map(StreamItem::toFeedItem)
|
||||
@ -161,7 +162,12 @@ class LocalFeedRepository : FeedRepository {
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val CHUNK_SIZE = 2
|
||||
/**
|
||||
* Amount of feeds that are fetched concurrently.
|
||||
*
|
||||
* Should ideally be a factor of `BATCH_SIZE` to be correctly applied.
|
||||
*/
|
||||
private const val CHUNK_SIZE = 5
|
||||
|
||||
/**
|
||||
* Maximum amount of feeds that should be fetched together, before a delay should be applied.
|
||||
@ -169,9 +175,13 @@ class LocalFeedRepository : FeedRepository {
|
||||
private const val BATCH_SIZE = 50
|
||||
|
||||
/**
|
||||
* Millisecond delay between two consecutive batches to avoid throttling.
|
||||
* Millisecond delay after fetching `BATCH_SIZE` channels to avoid throttling.
|
||||
*
|
||||
* A channel is only counted as fetched when it had a recent upload, requiring to fetch
|
||||
* the channelInfo via Innertube.
|
||||
*/
|
||||
private val BATCH_DELAY = (500L..1500L)
|
||||
private val CHANNEL_BATCH_DELAY = (500L..1500L)
|
||||
|
||||
private const val MAX_FEED_AGE_DAYS = 30L // 30 days
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user