mirror of
https://github.com/TeamNewPipe/NewPipe
synced 2025-01-03 14:00:32 +00:00
Extract actual feed loading code into separate method
Increase readability
This commit is contained in:
TobiGr
Stypox
parent
5c7c382323
commit
6ab8716e69
@ -1,6 +1,7 @@
|
|||||||
package org.schabi.newpipe.local.feed.service
|
package org.schabi.newpipe.local.feed.service
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
|
import android.content.SharedPreferences
|
||||||
import androidx.preference.PreferenceManager
|
import androidx.preference.PreferenceManager
|
||||||
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
|
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
|
||||||
import io.reactivex.rxjava3.core.Completable
|
import io.reactivex.rxjava3.core.Completable
|
||||||
@ -13,6 +14,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers
|
|||||||
import org.schabi.newpipe.R
|
import org.schabi.newpipe.R
|
||||||
import org.schabi.newpipe.database.feed.model.FeedGroupEntity
|
import org.schabi.newpipe.database.feed.model.FeedGroupEntity
|
||||||
import org.schabi.newpipe.database.subscription.NotificationMode
|
import org.schabi.newpipe.database.subscription.NotificationMode
|
||||||
|
import org.schabi.newpipe.database.subscription.SubscriptionEntity
|
||||||
import org.schabi.newpipe.extractor.Info
|
import org.schabi.newpipe.extractor.Info
|
||||||
import org.schabi.newpipe.extractor.NewPipe
|
import org.schabi.newpipe.extractor.NewPipe
|
||||||
import org.schabi.newpipe.extractor.feed.FeedInfo
|
import org.schabi.newpipe.extractor.feed.FeedInfo
|
||||||
@ -108,99 +110,7 @@ class FeedLoadManager(private val context: Context) {
|
|||||||
.runOn(Schedulers.io(), PARALLEL_EXTRACTIONS * 2)
|
.runOn(Schedulers.io(), PARALLEL_EXTRACTIONS * 2)
|
||||||
.filter { !cancelSignal.get() }
|
.filter { !cancelSignal.get() }
|
||||||
.map { subscriptionEntity ->
|
.map { subscriptionEntity ->
|
||||||
var error: Throwable? = null
|
loadStreams(subscriptionEntity, useFeedExtractor, defaultSharedPreferences)
|
||||||
val storeOriginalErrorAndRethrow = { e: Throwable ->
|
|
||||||
// keep original to prevent blockingGet() from wrapping it into RuntimeException
|
|
||||||
error = e
|
|
||||||
throw e
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
// check for and load new streams
|
|
||||||
// either by using the dedicated feed method or by getting the channel info
|
|
||||||
var originalInfo: Info? = null
|
|
||||||
var streams: List<StreamInfoItem>? = null
|
|
||||||
val errors = ArrayList<Throwable>()
|
|
||||||
|
|
||||||
if (useFeedExtractor) {
|
|
||||||
NewPipe.getService(subscriptionEntity.serviceId)
|
|
||||||
.getFeedExtractor(subscriptionEntity.url)
|
|
||||||
?.also { feedExtractor ->
|
|
||||||
// the user wants to use a feed extractor and there is one, use it
|
|
||||||
val feedInfo = FeedInfo.getInfo(feedExtractor)
|
|
||||||
errors.addAll(feedInfo.errors)
|
|
||||||
originalInfo = feedInfo
|
|
||||||
streams = feedInfo.relatedItems
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (originalInfo == null) {
|
|
||||||
// use the normal channel tabs extractor if either the user wants it, or
|
|
||||||
// the current service does not have a dedicated feed extractor
|
|
||||||
|
|
||||||
val channelInfo = getChannelInfo(
|
|
||||||
subscriptionEntity.serviceId,
|
|
||||||
subscriptionEntity.url, true
|
|
||||||
)
|
|
||||||
.onErrorReturn(storeOriginalErrorAndRethrow)
|
|
||||||
.blockingGet()
|
|
||||||
errors.addAll(channelInfo.errors)
|
|
||||||
originalInfo = channelInfo
|
|
||||||
|
|
||||||
streams = channelInfo.tabs
|
|
||||||
.filter { tab ->
|
|
||||||
ChannelTabHelper.fetchFeedChannelTab(
|
|
||||||
context,
|
|
||||||
defaultSharedPreferences,
|
|
||||||
tab
|
|
||||||
)
|
|
||||||
}
|
|
||||||
.map {
|
|
||||||
Pair(
|
|
||||||
getChannelTab(subscriptionEntity.serviceId, it, true)
|
|
||||||
.onErrorReturn(storeOriginalErrorAndRethrow)
|
|
||||||
.blockingGet(),
|
|
||||||
it
|
|
||||||
)
|
|
||||||
}
|
|
||||||
.flatMap { (channelTabInfo, linkHandler) ->
|
|
||||||
errors.addAll(channelTabInfo.errors)
|
|
||||||
if (channelTabInfo.relatedItems.isEmpty() &&
|
|
||||||
channelTabInfo.nextPage != null
|
|
||||||
) {
|
|
||||||
val infoItemsPage = getMoreChannelTabItems(
|
|
||||||
subscriptionEntity.serviceId,
|
|
||||||
linkHandler, channelTabInfo.nextPage
|
|
||||||
)
|
|
||||||
.blockingGet()
|
|
||||||
|
|
||||||
errors.addAll(infoItemsPage.errors)
|
|
||||||
return@flatMap infoItemsPage.items
|
|
||||||
} else {
|
|
||||||
return@flatMap channelTabInfo.relatedItems
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.filterIsInstance<StreamInfoItem>()
|
|
||||||
}
|
|
||||||
|
|
||||||
return@map Notification.createOnNext(
|
|
||||||
FeedUpdateInfo(
|
|
||||||
subscriptionEntity,
|
|
||||||
originalInfo!!,
|
|
||||||
streams!!,
|
|
||||||
errors,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
val request = "${subscriptionEntity.serviceId}:${subscriptionEntity.url}"
|
|
||||||
val wrapper = FeedLoadService.RequestException(
|
|
||||||
subscriptionEntity.uid,
|
|
||||||
request,
|
|
||||||
// do this to prevent blockingGet() from wrapping into RuntimeException
|
|
||||||
error ?: e
|
|
||||||
)
|
|
||||||
return@map Notification.createOnError<FeedUpdateInfo>(wrapper)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
.sequential()
|
.sequential()
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
.observeOn(AndroidSchedulers.mainThread())
|
||||||
@ -226,6 +136,107 @@ class FeedLoadManager(private val context: Context) {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun loadStreams(
|
||||||
|
subscriptionEntity: SubscriptionEntity,
|
||||||
|
useFeedExtractor: Boolean,
|
||||||
|
defaultSharedPreferences: SharedPreferences
|
||||||
|
):
|
||||||
|
Notification<FeedUpdateInfo> {
|
||||||
|
var error: Throwable? = null
|
||||||
|
val storeOriginalErrorAndRethrow = { e: Throwable ->
|
||||||
|
// keep original to prevent blockingGet() from wrapping it into RuntimeException
|
||||||
|
error = e
|
||||||
|
throw e
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
// check for and load new streams
|
||||||
|
// either by using the dedicated feed method or by getting the channel info
|
||||||
|
var originalInfo: Info? = null
|
||||||
|
var streams: List<StreamInfoItem>? = null
|
||||||
|
val errors = ArrayList<Throwable>()
|
||||||
|
|
||||||
|
if (useFeedExtractor) {
|
||||||
|
NewPipe.getService(subscriptionEntity.serviceId)
|
||||||
|
.getFeedExtractor(subscriptionEntity.url)
|
||||||
|
?.also { feedExtractor ->
|
||||||
|
// the user wants to use a feed extractor and there is one, use it
|
||||||
|
val feedInfo = FeedInfo.getInfo(feedExtractor)
|
||||||
|
errors.addAll(feedInfo.errors)
|
||||||
|
originalInfo = feedInfo
|
||||||
|
streams = feedInfo.relatedItems
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (originalInfo == null) {
|
||||||
|
// use the normal channel tabs extractor if either the user wants it, or
|
||||||
|
// the current service does not have a dedicated feed extractor
|
||||||
|
|
||||||
|
val channelInfo = getChannelInfo(
|
||||||
|
subscriptionEntity.serviceId,
|
||||||
|
subscriptionEntity.url, true
|
||||||
|
)
|
||||||
|
.onErrorReturn(storeOriginalErrorAndRethrow)
|
||||||
|
.blockingGet()
|
||||||
|
errors.addAll(channelInfo.errors)
|
||||||
|
originalInfo = channelInfo
|
||||||
|
|
||||||
|
streams = channelInfo.tabs
|
||||||
|
.filter { tab ->
|
||||||
|
ChannelTabHelper.fetchFeedChannelTab(
|
||||||
|
context,
|
||||||
|
defaultSharedPreferences,
|
||||||
|
tab
|
||||||
|
)
|
||||||
|
}
|
||||||
|
.map {
|
||||||
|
Pair(
|
||||||
|
getChannelTab(subscriptionEntity.serviceId, it, true)
|
||||||
|
.onErrorReturn(storeOriginalErrorAndRethrow)
|
||||||
|
.blockingGet(),
|
||||||
|
it
|
||||||
|
)
|
||||||
|
}
|
||||||
|
.flatMap { (channelTabInfo, linkHandler) ->
|
||||||
|
errors.addAll(channelTabInfo.errors)
|
||||||
|
if (channelTabInfo.relatedItems.isEmpty() &&
|
||||||
|
channelTabInfo.nextPage != null
|
||||||
|
) {
|
||||||
|
val infoItemsPage = getMoreChannelTabItems(
|
||||||
|
subscriptionEntity.serviceId,
|
||||||
|
linkHandler, channelTabInfo.nextPage
|
||||||
|
)
|
||||||
|
.blockingGet()
|
||||||
|
|
||||||
|
errors.addAll(infoItemsPage.errors)
|
||||||
|
return@flatMap infoItemsPage.items
|
||||||
|
} else {
|
||||||
|
return@flatMap channelTabInfo.relatedItems
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.filterIsInstance<StreamInfoItem>()
|
||||||
|
}
|
||||||
|
|
||||||
|
return Notification.createOnNext(
|
||||||
|
FeedUpdateInfo(
|
||||||
|
subscriptionEntity,
|
||||||
|
originalInfo!!,
|
||||||
|
streams!!,
|
||||||
|
errors,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
} catch (e: Throwable) {
|
||||||
|
val request = "${subscriptionEntity.serviceId}:${subscriptionEntity.url}"
|
||||||
|
val wrapper = FeedLoadService.RequestException(
|
||||||
|
subscriptionEntity.uid,
|
||||||
|
request,
|
||||||
|
// do this to prevent blockingGet() from wrapping into RuntimeException
|
||||||
|
error ?: e
|
||||||
|
)
|
||||||
|
return Notification.createOnError(wrapper)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Keep the feed and the stream tables small
|
* Keep the feed and the stream tables small
|
||||||
* to reduce loading times when trying to display the feed.
|
* to reduce loading times when trying to display the feed.
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user