Store manga sources in database #426
parent
03b92c4898
commit
376cee1859
GPG Key ID:
676DEE768C17A9D7
@ -0,0 +1,57 @@
|
|||||||
|
package org.koitharu.kotatsu.core.db.dao
|
||||||
|
|
||||||
|
import androidx.room.Dao
|
||||||
|
import androidx.room.Insert
|
||||||
|
import androidx.room.OnConflictStrategy
|
||||||
|
import androidx.room.Query
|
||||||
|
import androidx.room.Transaction
|
||||||
|
import androidx.room.Upsert
|
||||||
|
import kotlinx.coroutines.flow.Flow
|
||||||
|
import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
|
||||||
|
|
||||||
|
@Dao
|
||||||
|
abstract class MangaSourcesDao {
|
||||||
|
|
||||||
|
@Query("SELECT * FROM sources ORDER BY sort_key")
|
||||||
|
abstract suspend fun findAll(): List<MangaSourceEntity>
|
||||||
|
|
||||||
|
@Query("SELECT * FROM sources WHERE enabled = 1 ORDER BY sort_key")
|
||||||
|
abstract suspend fun findAllEnabled(): List<MangaSourceEntity>
|
||||||
|
|
||||||
|
@Query("SELECT * FROM sources WHERE enabled = 1 ORDER BY sort_key")
|
||||||
|
abstract fun observeEnabled(): Flow<List<MangaSourceEntity>>
|
||||||
|
|
||||||
|
@Query("SELECT * FROM sources ORDER BY sort_key")
|
||||||
|
abstract fun observeAll(): Flow<List<MangaSourceEntity>>
|
||||||
|
|
||||||
|
@Query("SELECT MAX(sort_key) FROM sources")
|
||||||
|
abstract suspend fun getMaxSortKey(): Int
|
||||||
|
|
||||||
|
@Query("UPDATE sources SET enabled = 0")
|
||||||
|
abstract suspend fun disableAllSources()
|
||||||
|
|
||||||
|
@Query("UPDATE sources SET sort_key = :sortKey WHERE source = :source")
|
||||||
|
abstract suspend fun setSortKey(source: String, sortKey: Int)
|
||||||
|
|
||||||
|
@Insert(onConflict = OnConflictStrategy.IGNORE)
|
||||||
|
@Transaction
|
||||||
|
abstract suspend fun insertIfAbsent(entries: Iterable<MangaSourceEntity>)
|
||||||
|
|
||||||
|
@Upsert
|
||||||
|
abstract suspend fun upsert(entry: MangaSourceEntity)
|
||||||
|
|
||||||
|
@Transaction
|
||||||
|
open suspend fun setEnabled(source: String, isEnabled: Boolean) {
|
||||||
|
if (updateIsEnabled(source, isEnabled) == 0) {
|
||||||
|
val entity = MangaSourceEntity(
|
||||||
|
source = source,
|
||||||
|
isEnabled = isEnabled,
|
||||||
|
sortKey = getMaxSortKey() + 1,
|
||||||
|
)
|
||||||
|
upsert(entity)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Query("UPDATE sources SET enabled = :isEnabled WHERE source = :source")
|
||||||
|
protected abstract suspend fun updateIsEnabled(source: String, isEnabled: Boolean): Int
|
||||||
|
}
|
||||||
@ -0,0 +1,16 @@
|
|||||||
|
package org.koitharu.kotatsu.core.db.entity
|
||||||
|
|
||||||
|
import androidx.room.ColumnInfo
|
||||||
|
import androidx.room.Entity
|
||||||
|
import androidx.room.PrimaryKey
|
||||||
|
|
||||||
|
@Entity(
|
||||||
|
tableName = "sources",
|
||||||
|
)
|
||||||
|
data class MangaSourceEntity(
|
||||||
|
@PrimaryKey(autoGenerate = false)
|
||||||
|
@ColumnInfo(name = "source")
|
||||||
|
val source: String,
|
||||||
|
@ColumnInfo(name = "enabled") val isEnabled: Boolean,
|
||||||
|
@ColumnInfo(name = "sort_key", index = true) val sortKey: Int,
|
||||||
|
)
|
||||||
@ -0,0 +1,36 @@
|
|||||||
|
package org.koitharu.kotatsu.core.db.migrations
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import androidx.preference.PreferenceManager
|
||||||
|
import androidx.room.migration.Migration
|
||||||
|
import androidx.sqlite.db.SupportSQLiteDatabase
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaSource
|
||||||
|
|
||||||
|
class Migration16To17(context: Context) : Migration(16, 17) {
|
||||||
|
|
||||||
|
private val prefs = PreferenceManager.getDefaultSharedPreferences(context)
|
||||||
|
|
||||||
|
override fun migrate(database: SupportSQLiteDatabase) {
|
||||||
|
database.execSQL("CREATE TABLE `sources` (`source` TEXT NOT NULL, `enabled` INTEGER NOT NULL, `sort_key` INTEGER NOT NULL, PRIMARY KEY(`source`))")
|
||||||
|
database.execSQL("CREATE INDEX `index_sources_sort_key` ON `sources` (`sort_key`)")
|
||||||
|
val hiddenSources = prefs.getStringSet("sources_hidden", null).orEmpty()
|
||||||
|
val order = prefs.getString("sources_order_2", null)?.split('|').orEmpty()
|
||||||
|
val sources = MangaSource.values()
|
||||||
|
for (source in sources) {
|
||||||
|
if (source == MangaSource.LOCAL) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
val name = source.name
|
||||||
|
var sortKey = order.indexOf(name)
|
||||||
|
if (sortKey == -1) {
|
||||||
|
sortKey = order.size + source.ordinal
|
||||||
|
}
|
||||||
|
database.execSQL(
|
||||||
|
"INSERT INTO `sources` (`source`, `enabled`, `sort_key`) VALUES (?, ?, ?)",
|
||||||
|
arrayOf(name, (name !in hiddenSources).toInt(), sortKey),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun Boolean.toInt() = if (this) 1 else 0
|
||||||
|
}
|
||||||
@ -0,0 +1,150 @@
|
|||||||
|
package org.koitharu.kotatsu.explore.data
|
||||||
|
|
||||||
|
import androidx.room.withTransaction
|
||||||
|
import dagger.Reusable
|
||||||
|
import kotlinx.coroutines.flow.Flow
|
||||||
|
import kotlinx.coroutines.flow.distinctUntilChanged
|
||||||
|
import kotlinx.coroutines.flow.map
|
||||||
|
import org.koitharu.kotatsu.BuildConfig
|
||||||
|
import org.koitharu.kotatsu.core.db.MangaDatabase
|
||||||
|
import org.koitharu.kotatsu.core.db.dao.MangaSourcesDao
|
||||||
|
import org.koitharu.kotatsu.core.db.entity.MangaSourceEntity
|
||||||
|
import org.koitharu.kotatsu.core.model.MangaSource
|
||||||
|
import org.koitharu.kotatsu.core.ui.util.ReversibleHandle
|
||||||
|
import org.koitharu.kotatsu.parsers.model.MangaSource
|
||||||
|
import org.koitharu.kotatsu.parsers.util.move
|
||||||
|
import java.util.Collections
|
||||||
|
import java.util.EnumSet
|
||||||
|
import javax.inject.Inject
|
||||||
|
|
||||||
|
@Reusable
|
||||||
|
class MangaSourcesRepository @Inject constructor(
|
||||||
|
private val db: MangaDatabase,
|
||||||
|
) {
|
||||||
|
|
||||||
|
private val dao: MangaSourcesDao
|
||||||
|
get() = db.sourcesDao
|
||||||
|
|
||||||
|
private val remoteSources = EnumSet.allOf(MangaSource::class.java).apply {
|
||||||
|
remove(MangaSource.LOCAL)
|
||||||
|
if (!BuildConfig.DEBUG) {
|
||||||
|
remove(MangaSource.DUMMY)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val allMangaSources: Set<MangaSource>
|
||||||
|
get() = Collections.unmodifiableSet(remoteSources)
|
||||||
|
|
||||||
|
suspend fun getEnabledSources(): List<MangaSource> {
|
||||||
|
return dao.findAllEnabled().toSources()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun observeEnabledSources(): Flow<List<MangaSource>> = dao.observeEnabled().map {
|
||||||
|
it.toSources()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun observeAll(): Flow<List<Pair<MangaSource, Boolean>>> = dao.observeAll().map { entities ->
|
||||||
|
val result = ArrayList<Pair<MangaSource, Boolean>>(entities.size)
|
||||||
|
for (entity in entities) {
|
||||||
|
val source = MangaSource(entity.source)
|
||||||
|
if (source in remoteSources) {
|
||||||
|
result.add(source to entity.isEnabled)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
result
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun setSourceEnabled(source: MangaSource, isEnabled: Boolean): ReversibleHandle {
|
||||||
|
dao.setEnabled(source.name, isEnabled)
|
||||||
|
return ReversibleHandle {
|
||||||
|
dao.setEnabled(source.name, !isEnabled)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun setSourcesEnabled(sources: Iterable<MangaSource>, isEnabled: Boolean) {
|
||||||
|
db.withTransaction {
|
||||||
|
for (s in sources) {
|
||||||
|
dao.setEnabled(s.name, isEnabled)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun disableAllSources() {
|
||||||
|
db.withTransaction {
|
||||||
|
assimilateNewSources()
|
||||||
|
dao.disableAllSources()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun setPosition(source: MangaSource, index: Int) {
|
||||||
|
db.withTransaction {
|
||||||
|
val all = dao.findAll().toMutableList()
|
||||||
|
val sourceIndex = all.indexOfFirst { x -> x.source == source.name }
|
||||||
|
if (sourceIndex !in all.indices) {
|
||||||
|
val entity = MangaSourceEntity(
|
||||||
|
source = source.name,
|
||||||
|
isEnabled = false,
|
||||||
|
sortKey = index,
|
||||||
|
)
|
||||||
|
all.add(index, entity)
|
||||||
|
dao.upsert(entity)
|
||||||
|
} else {
|
||||||
|
all.move(sourceIndex, index)
|
||||||
|
}
|
||||||
|
for ((i, e) in all.withIndex()) {
|
||||||
|
if (e.sortKey != i) {
|
||||||
|
dao.setSortKey(e.source, i)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun observeNewSources(): Flow<Set<MangaSource>> = dao.observeAll().map { entities ->
|
||||||
|
val result = EnumSet.copyOf(remoteSources)
|
||||||
|
for (e in entities) {
|
||||||
|
result.remove(MangaSource(e.source))
|
||||||
|
}
|
||||||
|
result
|
||||||
|
}.distinctUntilChanged()
|
||||||
|
|
||||||
|
suspend fun getNewSources(): Set<MangaSource> {
|
||||||
|
val entities = dao.findAll()
|
||||||
|
val result = EnumSet.copyOf(remoteSources)
|
||||||
|
for (e in entities) {
|
||||||
|
result.remove(MangaSource(e.source))
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun assimilateNewSources(): Set<MangaSource> {
|
||||||
|
val new = getNewSources()
|
||||||
|
if (new.isEmpty()) {
|
||||||
|
return emptySet()
|
||||||
|
}
|
||||||
|
var maxSortKey = dao.getMaxSortKey()
|
||||||
|
val entities = new.map { x ->
|
||||||
|
MangaSourceEntity(
|
||||||
|
source = x.name,
|
||||||
|
isEnabled = false,
|
||||||
|
sortKey = ++maxSortKey,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
dao.insertIfAbsent(entities)
|
||||||
|
return new
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun isSetupRequired(): Boolean {
|
||||||
|
return dao.findAll().isEmpty()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun List<MangaSourceEntity>.toSources(): List<MangaSource> {
|
||||||
|
val result = ArrayList<MangaSource>(size)
|
||||||
|
for (entity in this) {
|
||||||
|
val source = MangaSource(entity.source)
|
||||||
|
if (source in remoteSources) {
|
||||||
|
result.add(source)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,24 @@
|
|||||||
|
package org.koitharu.kotatsu.settings
|
||||||
|
|
||||||
|
import androidx.lifecycle.viewModelScope
|
||||||
|
import dagger.hilt.android.lifecycle.HiltViewModel
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.flow.SharingStarted
|
||||||
|
import kotlinx.coroutines.flow.map
|
||||||
|
import kotlinx.coroutines.flow.stateIn
|
||||||
|
import kotlinx.coroutines.plus
|
||||||
|
import org.koitharu.kotatsu.core.ui.BaseViewModel
|
||||||
|
import org.koitharu.kotatsu.explore.data.MangaSourcesRepository
|
||||||
|
import javax.inject.Inject
|
||||||
|
|
||||||
|
@HiltViewModel
|
||||||
|
class RootSettingsViewModel @Inject constructor(
|
||||||
|
sourcesRepository: MangaSourcesRepository,
|
||||||
|
) : BaseViewModel() {
|
||||||
|
|
||||||
|
val totalSourcesCount = sourcesRepository.allMangaSources.size
|
||||||
|
|
||||||
|
val enabledSourcesCount = sourcesRepository.observeEnabledSources()
|
||||||
|
.map { it.size }
|
||||||
|
.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, -1)
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue