mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2025-01-23 15:36:57 +00:00
Code Issues Releases Wiki Activity

Improve subscription upsert methods

Browse Source
This commit is contained in:
Isira Seneviratne 2024-12-01 09:51:12 +05:30
parent bcfe6285a4
commit d6eaa4e66c
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/schabi/newpipe/database/subscription/SubscriptionDAO.kt
View File

@ -90,7 +90,7 @@ abstract class SubscriptionDAO : BasicDAO<SubscriptionEntity> {
internal abstract fun silentInsertAllInternal(entities: List<SubscriptionEntity>): List<Long> internal abstract fun silentInsertAllInternal(entities: List<SubscriptionEntity>): List<Long>
@Transaction @Transaction
open fun upsertAll(entities: List<SubscriptionEntity>): List<SubscriptionEntity> { open fun upsertAll(entities: List<SubscriptionEntity>) {
val insertUidList = silentInsertAllInternal(entities) val insertUidList = silentInsertAllInternal(entities)
insertUidList.forEachIndexed { index: Int, uidFromInsert: Long -> insertUidList.forEachIndexed { index: Int, uidFromInsert: Long ->
@ -106,7 +106,5 @@ abstract class SubscriptionDAO : BasicDAO<SubscriptionEntity> {
update(entity) update(entity)
} }
} }
return entities
} }
} }

17
app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionManager.kt
View File

@ -48,25 +48,18 @@ class SubscriptionManager(context: Context) {
} }
} }
fun upsertAll(infoList: List<Pair<ChannelInfo, List<ChannelTabInfo>>>): List<SubscriptionEntity> { fun upsertAll(infoList: List<Pair<ChannelInfo, ChannelTabInfo>>) {
val listEntities = subscriptionTable.upsertAll( val listEntities = infoList.map { SubscriptionEntity.from(it.first) }
infoList.map { SubscriptionEntity.from(it.first) } subscriptionTable.upsertAll(listEntities)
)
database.runInTransaction { database.runInTransaction {
infoList.forEachIndexed { index, info -> infoList.forEachIndexed { index, info ->
info.second.forEach { val streams = info.second.relatedItems.filterIsInstance<StreamInfoItem>()
feedDatabaseManager.upsertAll( feedDatabaseManager.upsertAll(listEntities[index].uid, streams)
listEntities[index].uid,
it.relatedItems.filterIsInstance<StreamInfoItem>()
)
} }
} }
} }
return listEntities
}
fun updateChannelInfo(info: ChannelInfo): Completable = fun updateChannelInfo(info: ChannelInfo): Completable =
subscriptionTable.getSubscription(info.serviceId, info.url) subscriptionTable.getSubscription(info.serviceId, info.url)
.flatMapCompletable { .flatMapCompletable {

2
app/src/main/java/org/schabi/newpipe/local/subscription/workers/SubscriptionImportWorker.kt
View File

@ -77,7 +77,7 @@ class SubscriptionImportWorker(
val currentIndex = mutex.withLock { index++ } val currentIndex = mutex.withLock { index++ }
setForeground(createForegroundInfo(title, channelInfo.name, currentIndex, qty)) setForeground(createForegroundInfo(title, channelInfo.name, currentIndex, qty))
Pair(channelInfo, listOf(channelTab)) Pair(channelInfo, channelTab)
} }
}.awaitAll() }.awaitAll()
} }