From 72504ca53fea97f2b52adf2a2f66ff4de7ad7fa9 Mon Sep 17 00:00:00 2001 From: NerdNumber9 Date: Fri, 3 Aug 2018 21:34:31 -0400 Subject: [PATCH] Minor typo fix and code cleanup --- .../tachiyomi/source/online/all/Hitomi.kt | 19 +++++++++---------- .../ui/setting/SettingsHlController.kt | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt index 7a0f3f90c..7c64a9ace 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/Hitomi.kt @@ -33,7 +33,6 @@ import io.realm.RealmConfiguration import io.realm.RealmResults import okhttp3.Request import okhttp3.Response -import org.jsoup.nodes.Document import org.jsoup.nodes.Element import rx.Observable import rx.Scheduler @@ -194,7 +193,7 @@ class Hitomi(private val context: Context) } override fun fetchSearchManga(page: Int, query: String, filters: FilterList): Observable { - return urlImportFetchSearchManga(query, { + return urlImportFetchSearchManga(query) { trySearch(page, query).map { val res = it.map { SManga.create().apply { @@ -210,7 +209,7 @@ class Hitomi(private val context: Context) MangasPage(res, it.isNotEmpty()) } - }) + } } override fun fetchMangaDetails(manga: SManga): Observable { @@ -309,8 +308,8 @@ class Hitomi(private val context: Context) val loc = "$BASE_URL/galleries/$hlId.html" val req = GET(loc) - return client.newCall(req).asObservableSuccess().map { - val doc = it.asJsoup() + return client.newCall(req).asObservableSuccess().map { response -> + val doc = response.asJsoup() Duktape.create().use { duck -> val thumbs = doc.getElementsByTag("script").find { @@ -351,10 +350,10 @@ class Hitomi(private val context: Context) uploadDate = DATE_FORMAT.parse(doc.select(".date").text()).time - galleryParent.select(".gallery-info tr").forEach { - val content = it.child(1) + galleryParent.select(".gallery-info tr").forEach { element -> + val content = element.child(1) - when(it.child(0).text().toLowerCase()) { + when(element.child(0).text().toLowerCase()) { "group" -> group = content.text().trim() "type" -> type = content.text().trim() "language" -> { @@ -429,8 +428,8 @@ class Hitomi(private val context: Context) it.insert(newPages) } - (0 .. 1).map { getCacheRealm(it) }.forEach { - it.useTrans { + (0 .. 1).map { getCacheRealm(it) }.forEach { realm -> + realm.useTrans { // Delete old meta it.where(HitomiSkeletonGalleryMetadata::class.java) .equalTo(HitomiSkeletonGalleryMetadata::hlId.name, hlId) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsHlController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsHlController.kt index 60ddc627a..1cccc5e16 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsHlController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsHlController.kt @@ -43,7 +43,7 @@ class SettingsHlController : SettingsController() { preference { title = "Force refresh search database now" - summary = "Delete the local copy of the hitomi.la search database and download the new database now. Hitomi.la search will not working in the ~10mins that it takes to refresh the search database" + summary = "Delete the local copy of the hitomi.la search database and download the new database now. Hitomi.la search will not work in the ~10mins that it takes to refresh the search database" isPersistent = false onClick {