Merge remote-tracking branch 'origin/master'

buildSrc/src/main/resources/report.html

@@ -57,7 +57,7 @@
 				data-bs-toggle="modal" style="cursor: pointer;">
 				<i data-feather="power"></i>
 			</td>
-			{% elseif case.failure.type == 'org.koitharu.kotatsu.parsers.exception.CloudFlareProtectedException' %}
+			{% elseif case.failure.type == 'org.koitharu.kotatsu.parsers.CloudFlareProtectedException' %}
 			<td class="table-secondary text-center" data-bs-target="#failure_{{ case.hashCode }}"
 				data-bs-toggle="modal" style="cursor: pointer;">
 				<i data-feather="shield"></i>
@@ -101,29 +101,6 @@
 	feather.replace()
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 </script>
 </body>
 </html>

src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/MadaraParser.kt

@@ -278,15 +278,7 @@ internal abstract class MadaraParser(
 			async { getChapters(manga, doc) }
 		}
 
-		val desc = body.select(selectdesc).let {
-			if (it.select("p").text().isNotEmpty()) {
-				it.select("p").joinToString(separator = "\n\n") { p ->
-					p.text().replace("<br>", "\n")
-				}
-			} else {
-				it.text()
-			}
-		}
+		val desc = body.select(selectdesc).html()
 
 		val stateDiv = (body.selectFirst("div.post-content_item:contains(Status)")
 			?: body.selectFirst("div.post-content_item:contains(Statut)")

src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaDass.kt

@@ -110,15 +110,7 @@ internal class MangaDass(context: MangaLoaderContext) :
 
 		val chaptersDeferred = async { getChapters(manga, doc) }
 
-		val desc = body.select(selectdesc).let {
-			if (it.select("p").text().isNotEmpty()) {
-				it.select("p").joinToString(separator = "\n\n") { p ->
-					p.text().replace("<br>", "\n")
-				}
-			} else {
-				it.text()
-			}
-		}
+		val desc = body.select(selectdesc).html()
 
 		val stateDiv = (body.selectFirst("div.post-content_item:contains(Status)"))?.selectLast("div.summary-content")
 

src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/en/MangaDna.kt

@@ -108,15 +108,7 @@ internal class MangaDna(context: MangaLoaderContext) :
 
 		val chaptersDeferred = async { getChapters(manga, doc) }
 
-		val desc = body.select(selectdesc).let {
-			if (it.select("p").text().isNotEmpty()) {
-				it.select("p").joinToString(separator = "\n\n") { p ->
-					p.text().replace("<br>", "\n")
-				}
-			} else {
-				it.text()
-			}
-		}
+		val desc = body.select(selectdesc).html()
 
 		val stateDiv = (body.selectFirst("div.post-content_item:contains(Status)"))?.selectLast("div.summary-content")
 

src/main/kotlin/org/koitharu/kotatsu/parsers/site/madara/ja/HachiManga.kt

@@ -119,15 +119,7 @@ internal class HachiManga(context: MangaLoaderContext) : MadaraParser(context, M
 
 		val chaptersDeferred = async { getChapters(manga, doc) }
 
-		val desc = body.select(selectdesc).let {
-			if (it.select("p").text().isNotEmpty()) {
-				it.select("p").joinToString(separator = "\n\n") { p ->
-					p.text().replace("<br>", "\n")
-				}
-			} else {
-				it.text()
-			}
-		}
+		val desc = body.select(selectdesc).html()
 
 		val stateDiv = (body.selectFirst("div.post-content_item:contains(状態)"))?.selectLast("div.summary-content")
 

src/test/kotlin/org/koitharu/kotatsu/parsers/CloudFlareInterceptor.kt

@@ -3,7 +3,6 @@ package org.koitharu.kotatsu.parsers
 import okhttp3.Interceptor
 import okhttp3.Response
 import okhttp3.internal.closeQuietly
-import org.koitharu.kotatsu.parsers.exception.CloudFlareProtectedException
 import java.net.HttpURLConnection
 
 private const val HEADER_SERVER = "Server"

src/test/kotlin/org/koitharu/kotatsu/parsers/CloudFlareProtectedException.kt

@@ -1,4 +1,4 @@
-package org.koitharu.kotatsu.parsers.exception
+package org.koitharu.kotatsu.parsers
 
 import okhttp3.Headers
 import okio.IOException