Merge pull request #647 from NagaYZ/fix-issue

Fix Omegscans

src/main/kotlin/org/koitharu/kotatsu/parsers/site/heancms/en/OmegaScans.kt

@@ -1,11 +1,146 @@
 package org.koitharu.kotatsu.parsers.site.heancms.en
 
+import org.json.JSONArray
 import org.koitharu.kotatsu.parsers.MangaLoaderContext
 import org.koitharu.kotatsu.parsers.MangaSourceParser
-import org.koitharu.kotatsu.parsers.model.ContentType
-import org.koitharu.kotatsu.parsers.model.MangaSource
+import org.koitharu.kotatsu.parsers.model.*
 import org.koitharu.kotatsu.parsers.site.heancms.HeanCms
+import org.koitharu.kotatsu.parsers.util.*
+import org.koitharu.kotatsu.parsers.util.json.getFloatOrDefault
+import org.koitharu.kotatsu.parsers.util.json.mapJSON
+import java.text.SimpleDateFormat
+import java.util.Locale
 
 @MangaSourceParser("OMEGASCANS", "OmegaScans", "en", ContentType.HENTAI)
-internal class OmegaScans(context: MangaLoaderContext) :
-	HeanCms(context, MangaSource.OMEGASCANS, "omegascans.org")
+internal class OmegaScans(context: MangaLoaderContext) : HeanCms(context, MangaSource.OMEGASCANS, "omegascans.org") {
+	override suspend fun getListPage(page: Int, filter: MangaListFilter?): List<Manga> {
+		val url = buildString {
+			append("https://api.")
+			append(domain)
+			append("/query?adult=true&query_string=")
+			when (filter) {
+				is MangaListFilter.Search -> {
+					append(filter.query.urlEncoded())
+				}
+
+				is MangaListFilter.Advanced -> {
+
+					filter.states.oneOrThrowIfMany()?.let {
+						append("&series_status=")
+						append(
+							when (it) {
+								MangaState.ONGOING -> "Ongoing"
+								MangaState.FINISHED -> "Completed"
+								MangaState.ABANDONED -> "Dropped"
+								MangaState.PAUSED -> "Hiatus"
+								else -> ""
+							},
+						)
+
+					}
+					append("&orderBy=")
+					when (filter.sortOrder) {
+						SortOrder.POPULARITY -> append("total_views&order=desc")
+						SortOrder.UPDATED -> append("latest&order=desc")
+						SortOrder.NEWEST -> append("created_at&order=desc")
+						SortOrder.ALPHABETICAL -> append("title&order=desc")
+						SortOrder.ALPHABETICAL_DESC -> append("title&order=asc")
+						else -> append("latest&order=desc")
+					}
+					append("&series_type=All&perPage=$pageSize")
+					append("&tags_ids=")
+					append("[".urlEncoded())
+					append(filter.tags.joinToString(",") { it.key })
+					append("]".urlEncoded())
+
+				}
+
+				null -> {}
+			}
+			append("&page=")
+			append(page.toString())
+		}
+		val json = webClient.httpGet(url).parseJson()
+		return json.getJSONArray("data").mapJSON { j ->
+			val slug = j.getString("series_slug")
+			val urlManga = "https://$domain/$pathManga/$slug"
+			val cover = if (j.getString("thumbnail").contains('/')) {
+				j.getString("thumbnail")
+			} else {
+				"https://api.$domain/${j.getString("thumbnail")}"
+			}
+			Manga(
+				id = j.getLong("id"),
+				title = j.getString("title"),
+				altTitle = null,
+				url = urlManga.toRelativeUrl(domain),
+				publicUrl = urlManga,
+				rating = j.getFloatOrDefault("rating", RATING_UNKNOWN) / 5f,
+				isNsfw = true,
+				coverUrl = cover,
+				tags = setOf(),
+				state = when (j.getString("status")) {
+					"Ongoing" -> MangaState.ONGOING
+					"Completed" -> MangaState.FINISHED
+					"Dropped" -> MangaState.ABANDONED
+					"Hiatus" -> MangaState.PAUSED
+					else -> null
+				},
+				author = j.getString("author"),
+				source = source,
+				description = j.getString("description"),
+			)
+		}
+
+	}
+
+	override suspend fun getDetails(manga: Manga): Manga {
+		val url = buildString {
+			append("https://api.")
+			append(domain)
+			append("/chapter/query?perPage=9999&series_id=" + manga.id)
+		}
+		val json = webClient.httpGet(url).parseJson()
+		val dateFormat = SimpleDateFormat(datePattern, Locale.ENGLISH)
+
+		val chaptersJsonArray = json.getJSONArray("data")
+		var totalChapters = json.getJSONObject("meta").getInt("total")
+		val chapters = chaptersJsonArray.mapJSON { j ->
+			val slug = j.getJSONObject("series").getString("series_slug")
+			val chapterUrl = "https://$domain/$pathManga/$slug/${j.getString("chapter_slug")}"
+			val date = j.getString("created_at").substringBeforeLast("T")
+			MangaChapter(
+				id = j.getLong("id"),
+				url = chapterUrl,
+				name = j.getString("chapter_name"),
+				number = totalChapters--,
+				branch = null,
+				uploadDate = dateFormat.tryParse(date),
+				scanlator = null,
+				source = source,
+			)
+		}
+
+		return manga.copy(
+			chapters = chapters.reversed(),
+		)
+	}
+
+	override suspend fun getAvailableTags(): Set<MangaTag> {
+		val doc = webClient.httpGet("https://$domain/comics").parseHtml()
+
+		val tags = doc.selectFirstOrThrow("script:containsData(tags)").data()
+			.replace("\\", "")
+			.substringAfterLast("\"tags\":")
+			.substringBeforeLast("}],")
+
+		return JSONArray(tags).mapJSON {
+			MangaTag(
+				key = it.getInt("id").toString(),
+				title = it.getString("name"),
+				source = source,
+			)
+		}.toSet()
+	}
+
+}

src/main/kotlin/org/koitharu/kotatsu/parsers/site/zh/Baozimh.kt

@@ -185,8 +185,8 @@ internal class Baozimh(context: MangaLoaderContext) :
 	override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
 		val doc = webClient.httpGet(chapter.url.toAbsoluteUrl(domain)).parseHtml()
 		val pagesList = doc.requireElementById("__nuxt")
-		val chapterLink = doc.select("link[rel=canonical]").attr("href")
-		val nextChapterLink = doc.select("div.next_chapter a").attr("href")
+		var chapterLink = doc.select("link[rel=canonical]").attr("href")
+		var nextChapterLink = doc.select("a#next-chapter").attr("href")
 		var part = 2
 		val idSet = HashSet<Long>()
 		var pages = pagesList.select("button.pure-button").map { btn ->
@@ -201,11 +201,11 @@ internal class Baozimh(context: MangaLoaderContext) :
 			)
 		}
 
-		val chapterPart = chapterLink.substringAfterLast("/").substringBefore(".html")
-		val nexChapterPart = nextChapterLink.substringAfterLast("/").substringBefore(".html")
+		var chapterPart = chapterLink.substringAfterLast("/").substringBefore(".html")
+		var nexChapterPart = nextChapterLink.substringAfterLast("/").substringBefore(".html")
 		while (nextChapterLink != "" && (nexChapterPart == chapterPart + "_" + part.toString())){
-			val doc2 = webClient.httpGet(nextChapterLink).parseHtml().requireElementById("__nuxt")
-			val pages2 = doc2.select("button.pure-button").mapNotNull { btn ->
+			val doc2 = webClient.httpGet(nextChapterLink).parseHtml()
+			val pages2 = doc2.requireElementById("__nuxt").select("button.pure-button").mapNotNull { btn ->
 				val urlPage = btn.attr("on").substringAfter(": '").substringBefore("?t=")
 				val id = generateUid(urlPage)
 				if(!idSet.add(id)){
@@ -220,6 +220,10 @@ internal class Baozimh(context: MangaLoaderContext) :
 			}
 			pages = pages+pages2
 			part++
+			chapterLink = doc2.select("link[rel=canonical]").attr("href")
+			nextChapterLink = doc2.select("a#next-chapter").attr("href")
+			chapterPart = chapterLink.substringAfterLast("/").substringBefore(".html").substringBeforeLast("_")
+			nexChapterPart = nextChapterLink.substringAfterLast("/").substringBefore(".html")
 		}
 		return pages
 	}