Update: Merge Repository's entity and database.entity classes

+ Update related DAOs
+ Add needed converters
+ Fix calls
This commit is contained in:
machiav3lli
2022-01-28 00:31:27 +01:00
parent 050ecfd4a0
commit 7bbac86dd4
32 changed files with 418 additions and 419 deletions

View File

@ -4,9 +4,9 @@ import android.content.Context
import android.net.Uri
import com.looker.droidify.content.Cache
import com.looker.droidify.database.DatabaseX
import com.looker.droidify.database.entity.Repository
import com.looker.droidify.entity.Product
import com.looker.droidify.entity.Release
import com.looker.droidify.entity.Repository
import com.looker.droidify.network.Downloader
import com.looker.droidify.utility.ProgressInputStream
import com.looker.droidify.utility.RxUtils
@ -69,17 +69,15 @@ object RepositoryUpdater {
.observeOn(Schedulers.io())
.flatMapSingle {
RxUtils.querySingle {
db.repositoryDao.allDisabledDeleted
db.repositoryDao.allDisabled
}
}
.forEach { it ->
val newDisabled = it.asSequence().filter { !it.deleted }.map { it.id }.toSet()
val newDisabled = it.toSet()
val disabled = newDisabled - lastDisabled
lastDisabled = newDisabled
val deleted = it.asSequence().filter { it.deleted }.map { it.id }.toSet()
if (disabled.isNotEmpty() || deleted.isNotEmpty()) {
val pairs = (disabled.asSequence().map { Pair(it, false) } +
deleted.asSequence().map { Pair(it, true) }).toSet()
if (disabled.isNotEmpty()) {
val pairs = (disabled.asSequence().map { Pair(it, false) }).toSet()
synchronized(cleanupLock) { db.cleanUp(pairs) }
}
}