From 1107b95ebdfbc14f068fe679a55926c0f2250f91 Mon Sep 17 00:00:00 2001 From: NerdNumber9 Date: Sat, 26 Aug 2017 03:52:52 -0400 Subject: [PATCH] Remove leftover code --- .../ui/library/LibraryCategoryAdapter.kt | 1 - .../ui/library/LibraryCategoryView.kt | 6 --- .../tachiyomi/ui/library/LibraryItem.kt | 47 ------------------- 3 files changed, 54 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt index 5ca769617..227acd62a 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryAdapter.kt @@ -7,7 +7,6 @@ import exh.metadata.models.ExGalleryMetadata import exh.metadata.models.NHentaiMetadata import exh.metadata.models.PervEdenGalleryMetadata import exh.metadata.models.SearchableGalleryMetadata -import exh.metadata.queryMetadataFromManga import exh.metadata.syncMangaIds import exh.search.SearchEngine import exh.util.defRealm diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt index 7e99afe5f..245e0b9f9 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt @@ -115,12 +115,6 @@ class LibraryCategoryView @JvmOverloads constructor(context: Context, attrs: Att fun onBind(category: Category) { this.category = category - // Cache Realm (EH) - realm?.close() - realm = Realm.getDefaultInstance()?.apply { - meta = loadAllMetadata() - } - adapter.mode = if (controller.selectedMangas.isNotEmpty()) { FlexibleAdapter.MODE_MULTI } else { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt index 808357085..eda518fbb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt @@ -12,24 +12,9 @@ import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.util.inflate import eu.kanade.tachiyomi.widget.AutofitRecyclerView -import exh.* -import exh.metadata.ehMetaQueryFromUrl -import exh.metadata.models.ExGalleryMetadata -import exh.metadata.models.NHentaiMetadata -import exh.metadata.models.PervEdenGalleryMetadata -import exh.metadata.models.SearchableGalleryMetadata -import exh.metadata.nhentaiMetaQueryFromUrl -import exh.metadata.pervEdenMetaQueryFromUrl -import exh.search.SearchEngine -import exh.util.defRealm -import io.realm.RealmQuery import kotlinx.android.synthetic.main.catalogue_grid_item.view.* class LibraryItem(val manga: Manga) : AbstractFlexibleItem(), IFilterable { - // --> EH - private val searchEngine = SearchEngine() - // <-- EH - override fun getLayoutRes(): Int { return R.layout.catalogue_grid_item } @@ -67,38 +52,6 @@ class LibraryItem(val manga: Manga) : AbstractFlexibleItem(), IFi * @return true if the manga should be included, false otherwise. */ override fun filter(constraint: String): Boolean { - defRealm { realm -> - if (isLewdSource(manga.source)) { - val titleFields: List? - var query: RealmQuery? - when (manga.source) { - EH_SOURCE_ID -> { - titleFields = ExGalleryMetadata.TITLE_FIELDS - query = realm.ehMetaQueryFromUrl(manga.url, false) - } - EXH_SOURCE_ID -> { - titleFields = ExGalleryMetadata.TITLE_FIELDS - query = realm.ehMetaQueryFromUrl(manga.url, true) - } - PERV_EDEN_IT_SOURCE_ID, - PERV_EDEN_EN_SOURCE_ID -> { - titleFields = PervEdenGalleryMetadata.TITLE_FIELDS - query = realm.pervEdenMetaQueryFromUrl(manga.url, manga.source) - } - NHENTAI_SOURCE_ID -> { - titleFields = NHentaiMetadata.TITLE_FIELDS - query = realm.nhentaiMetaQueryFromUrl(manga.url) - } - else -> return@defRealm - } - val hasMeta = query!!.count() > 0 - if(hasMeta) { - val parsedQuery = searchEngine.parseQuery(constraint) - query = searchEngine.filterResults(query, parsedQuery, titleFields) - return@filter query.count() > 0 - } - } - } return manga.title.contains(constraint, true) || (manga.author?.contains(constraint, true) ?: false) }