From b0255f932555d1e86539da1a31a42d0f0c43c76f Mon Sep 17 00:00:00 2001
From: Mike <51273546+SnakeDoc83@users.noreply.github.com>
Date: Tue, 31 Mar 2020 22:25:42 -0400
Subject: [PATCH] Hentai2Read - update browse & latest (#2564)

---
 src/en/hentai2read/build.gradle               |  2 +-
 .../extension/en/hentai2read/Hentai2Read.kt   | 32 +++++++------------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/en/hentai2read/build.gradle b/src/en/hentai2read/build.gradle
index 768a84a93..9217ccd8a 100644
--- a/src/en/hentai2read/build.gradle
+++ b/src/en/hentai2read/build.gradle
@@ -5,7 +5,7 @@ ext {
     appName = 'Tachiyomi: Hentai2Read'
     pkgNameSuffix = 'en.hentai2read'
     extClass = '.Hentai2Read'
-    extVersionCode = 5
+    extVersionCode = 6
     libVersion = '1.2'
 }
 
diff --git a/src/en/hentai2read/src/eu/kanade/tachiyomi/extension/en/hentai2read/Hentai2Read.kt b/src/en/hentai2read/src/eu/kanade/tachiyomi/extension/en/hentai2read/Hentai2Read.kt
index 50d57ab5e..111229816 100644
--- a/src/en/hentai2read/src/eu/kanade/tachiyomi/extension/en/hentai2read/Hentai2Read.kt
+++ b/src/en/hentai2read/src/eu/kanade/tachiyomi/extension/en/hentai2read/Hentai2Read.kt
@@ -40,33 +40,27 @@ class Hentai2Read : ParsedHttpSource() {
         lateinit var base64String: String
     }
 
-    override fun popularMangaSelector() = "div.img-container div.img-overlay a"
+    override fun popularMangaSelector() = "div.book-grid-item"
 
-    override fun latestUpdatesSelector() = "ul.nav-users li.ribbon"
+    override fun latestUpdatesSelector() = popularMangaSelector()
 
     override fun popularMangaRequest(page: Int)
         = GET("$baseUrl/hentai-list/all/any/all/most-popular/$page/", headers)
 
     override fun latestUpdatesRequest(page: Int)
-        = GET("$baseUrl/latest/$page/", headers)
+        = GET("$baseUrl/hentai-list/all/any/all/last-updated/$page/", headers)
 
     override fun popularMangaFromElement(element: Element): SManga {
-        val manga = SManga.create()
-        manga.setUrlWithoutDomain(element.attr("href"))
-        element.select("h2.mangaPopover").let {
-            manga.title = it.attr("data-title").trim().substringBefore(" [").trim()
+        return SManga.create().apply {
+            thumbnail_url = element.select("img").attr("abs:data-src")
+            element.select("div.overlay-title a").let {
+                title = it.text()
+                setUrlWithoutDomain(it.attr("href"))
+            }
         }
-        return manga
     }
 
-    override fun latestUpdatesFromElement(element: Element): SManga {
-        val manga = SManga.create()
-        element.select("a.mangaPopover").let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.attr("data-title").trim().substringBefore(" [").trim()
-        }
-        return manga
-    }
+    override fun latestUpdatesFromElement(element: Element): SManga = popularMangaFromElement(element)
 
     override fun popularMangaNextPageSelector() = "a#js-linkNext"
 
@@ -137,9 +131,7 @@ class Hentai2Read : ParsedHttpSource() {
         val manga = SManga.create()
         manga.author = infoElement.select("li:contains(Author) > a")?.text()
         manga.artist = infoElement.select("li:contains(Artist) > a")?.text()
-        manga.genre = infoElement.select("li:contains(Category) > a, li:contains(Content) > a").map {
-            it.text()
-        }.joinToString(", ")
+        manga.genre = infoElement.select("li:contains(Category) > a, li:contains(Content) > a").joinToString(", ") { it.text() }
         manga.description = infoElement.select("li:contains(Storyline) > p")?.text()
         manga.status = infoElement.select("li:contains(Status) > a")?.text().orEmpty().let {parseStatus(it)}
         manga.thumbnail_url = document.select("a#js-linkNext > img")?.attr("src")
@@ -283,7 +275,7 @@ class Hentai2Read : ParsedHttpSource() {
     // Tags : 355
     // $("div#tab-tag > div:has(a.block)").map((i, el) => `Tag("${$(el).select("a").first().text().trim()}", ${$(el).find("input").first().attr("value")})`).get().sort().join(",\n")
     // on https://hentai2read.com/hentai-search/"
-	// 360 Tags 
+	// 360 Tags
     private fun getTagList() = listOf(
         Tag("Abortion", 529),
         Tag("Absent Parents", 1423),