Upgrade realm version
This commit is contained in:
parent
8cc6c0171b
commit
4d3b469c48
@ -295,7 +295,8 @@ class Hitomi(private val context: Context)
|
|||||||
val pages = defRealm { realm ->
|
val pages = defRealm { realm ->
|
||||||
val rres = realm.where(HitomiPage::class.java)
|
val rres = realm.where(HitomiPage::class.java)
|
||||||
.equalTo(HitomiPage::gallery.name, hlId)
|
.equalTo(HitomiPage::gallery.name, hlId)
|
||||||
.findAllSorted(HitomiPage::index.name)
|
.sort(HitomiPage::index.name)
|
||||||
|
.findAll()
|
||||||
|
|
||||||
if (rres.isNotEmpty())
|
if (rres.isNotEmpty())
|
||||||
rres.map(HitomiPage::url)
|
rres.map(HitomiPage::url)
|
||||||
|
@ -87,7 +87,8 @@ class LibraryCategoryAdapter(val view: LibraryCategoryView) :
|
|||||||
searchEngine.filterResults(it.value.where(),
|
searchEngine.filterResults(it.value.where(),
|
||||||
parsedQuery,
|
parsedQuery,
|
||||||
it.value.first()!!.titleFields)
|
it.value.first()!!.titleFields)
|
||||||
.findAllSorted(SearchableGalleryMetadata::mangaId.name).apply {
|
.sort(SearchableGalleryMetadata::mangaId.name)
|
||||||
|
.findAll().apply {
|
||||||
totalFilteredSize += size
|
totalFilteredSize += size
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package exh.metadata
|
package exh.metadata
|
||||||
|
|
||||||
|
import eu.kanade.tachiyomi.R.string.name
|
||||||
import eu.kanade.tachiyomi.data.database.models.Manga
|
import eu.kanade.tachiyomi.data.database.models.Manga
|
||||||
import eu.kanade.tachiyomi.source.SourceManager
|
import eu.kanade.tachiyomi.source.SourceManager
|
||||||
import eu.kanade.tachiyomi.source.online.LewdSource
|
import eu.kanade.tachiyomi.source.online.LewdSource
|
||||||
@ -18,7 +19,7 @@ fun Realm.loadAllMetadata(): Map<KClass<out SearchableGalleryMetadata>, RealmRes
|
|||||||
Injekt.get<SourceManager>().getOnlineSources().filterIsInstance<LewdSource<*, *>>().map {
|
Injekt.get<SourceManager>().getOnlineSources().filterIsInstance<LewdSource<*, *>>().map {
|
||||||
it.queryAll()
|
it.queryAll()
|
||||||
}.associate {
|
}.associate {
|
||||||
it.clazz to it.query(this@loadAllMetadata).findAllSorted(SearchableGalleryMetadata::mangaId.name)
|
it.clazz to it.query(this@loadAllMetadata).sort(SearchableGalleryMetadata::mangaId.name).findAll()
|
||||||
}.toMap()
|
}.toMap()
|
||||||
|
|
||||||
fun Realm.queryMetadataFromManga(manga: Manga,
|
fun Realm.queryMetadataFromManga(manga: Manga,
|
||||||
|
@ -460,18 +460,6 @@ class LoggingRealmQuery<E : RealmModel>(val query: RealmQuery<E>) {
|
|||||||
return query.isNotEmpty(fieldName)
|
return query.isNotEmpty(fieldName)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun distinct(fieldName: String): RealmResults<E> {
|
|
||||||
return query.distinct(fieldName)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun distinctAsync(fieldName: String): RealmResults<E> {
|
|
||||||
return query.distinctAsync(fieldName)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun distinct(firstFieldName: String, vararg remainingFieldNames: String): RealmResults<E> {
|
|
||||||
return query.distinct(firstFieldName, *remainingFieldNames)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun sum(fieldName: String): Number {
|
fun sum(fieldName: String): Number {
|
||||||
return query.sum(fieldName)
|
return query.sum(fieldName)
|
||||||
}
|
}
|
||||||
@ -508,38 +496,6 @@ class LoggingRealmQuery<E : RealmModel>(val query: RealmQuery<E>) {
|
|||||||
return query.findAllAsync()
|
return query.findAllAsync()
|
||||||
}
|
}
|
||||||
|
|
||||||
fun findAllSorted(fieldName: String, sortOrder: Sort): RealmResults<E> {
|
|
||||||
return query.findAllSorted(fieldName, sortOrder)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun findAllSortedAsync(fieldName: String, sortOrder: Sort): RealmResults<E> {
|
|
||||||
return query.findAllSortedAsync(fieldName, sortOrder)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun findAllSorted(fieldName: String): RealmResults<E> {
|
|
||||||
return query.findAllSorted(fieldName)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun findAllSortedAsync(fieldName: String): RealmResults<E> {
|
|
||||||
return query.findAllSortedAsync(fieldName)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun findAllSorted(fieldNames: Array<String>, sortOrders: Array<Sort>): RealmResults<E> {
|
|
||||||
return query.findAllSorted(fieldNames, sortOrders)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun findAllSortedAsync(fieldNames: Array<String>, sortOrders: Array<Sort>): RealmResults<E> {
|
|
||||||
return query.findAllSortedAsync(fieldNames, sortOrders)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun findAllSorted(fieldName1: String, sortOrder1: Sort, fieldName2: String, sortOrder2: Sort): RealmResults<E> {
|
|
||||||
return query.findAllSorted(fieldName1, sortOrder1, fieldName2, sortOrder2)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun findAllSortedAsync(fieldName1: String, sortOrder1: Sort, fieldName2: String, sortOrder2: Sort): RealmResults<E> {
|
|
||||||
return query.findAllSortedAsync(fieldName1, sortOrder1, fieldName2, sortOrder2)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun findFirst(): E? {
|
fun findFirst(): E? {
|
||||||
return query.findFirst()
|
return query.findFirst()
|
||||||
}
|
}
|
||||||
|
@ -16,7 +16,7 @@ buildscript {
|
|||||||
//Firebase (EH)
|
//Firebase (EH)
|
||||||
classpath 'com.google.gms:google-services:3.0.0'
|
classpath 'com.google.gms:google-services:3.0.0'
|
||||||
//Realm (EH)
|
//Realm (EH)
|
||||||
classpath "io.realm:realm-gradle-plugin:4.2.0"
|
classpath "io.realm:realm-gradle-plugin:5.0.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user