KotatsuApp
/
Kotatsu
2
0
Fork 0
Code Issues 124 Pull Requests Packages Projects Releases 163 Wiki Activity

Fix some manga sources

Browse Source
pull/26/head
Koitharu 5 years ago
parent 7f37c1f99e
commit 0e384c134d
22 changed files with 138 additions and 78 deletions
Show Stats Download Patch File Download Diff File

2
app/build.gradle
Unescape Escape View File

@ -48,7 +48,7 @@ android {
} }
testOptions { testOptions {
unitTests.includeAndroidResources = true unitTests.includeAndroidResources = true
unitTests.returnDefaultValues = true unitTests.returnDefaultValues = false
} }
} }
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {

13
app/src/main/java/org/koitharu/kotatsu/core/exceptions/AuthRequiredException.kt
Unescape Escape View File

@ -0,0 +1,13 @@
package org.koitharu.kotatsu.core.exceptions
import androidx.annotation.StringRes
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.core.exceptions.resolve.ResolvableException
class AuthRequiredException(
val url: String
) : RuntimeException("Authorization required"), ResolvableException {
@StringRes
override val resolveTextId: Int = R.string.sign_in
}

2
app/src/main/java/org/koitharu/kotatsu/core/exceptions/CloudFlareProtectedException.kt
Unescape Escape View File

@ -1,5 +1,6 @@
package org.koitharu.kotatsu.core.exceptions package org.koitharu.kotatsu.core.exceptions
import androidx.annotation.StringRes
import okio.IOException import okio.IOException
import org.koitharu.kotatsu.R import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.core.exceptions.resolve.ResolvableException import org.koitharu.kotatsu.core.exceptions.resolve.ResolvableException
@ -8,5 +9,6 @@ class CloudFlareProtectedException(
val url: String val url: String
) : IOException("Protected by CloudFlare"), ResolvableException { ) : IOException("Protected by CloudFlare"), ResolvableException {
@StringRes
override val resolveTextId: Int = R.string.captcha_solve override val resolveTextId: Int = R.string.captcha_solve
} }

2
app/src/main/java/org/koitharu/kotatsu/core/exceptions/resolve/ExceptionResolver.kt
Unescape Escape View File

@ -5,6 +5,7 @@ import androidx.fragment.app.FragmentManager
import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleOwner
import kotlinx.coroutines.suspendCancellableCoroutine import kotlinx.coroutines.suspendCancellableCoroutine
import org.koitharu.kotatsu.browser.cloudflare.CloudFlareDialog import org.koitharu.kotatsu.browser.cloudflare.CloudFlareDialog
import org.koitharu.kotatsu.core.exceptions.AuthRequiredException
import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
import kotlin.coroutines.Continuation import kotlin.coroutines.Continuation
import kotlin.coroutines.resume import kotlin.coroutines.resume
@ -18,6 +19,7 @@ class ExceptionResolver(
suspend fun resolve(e: ResolvableException): Boolean = when (e) { suspend fun resolve(e: ResolvableException): Boolean = when (e) {
is CloudFlareProtectedException -> resolveCF(e.url) is CloudFlareProtectedException -> resolveCF(e.url)
is AuthRequiredException -> false //TODO
else -> false else -> false
} }

3
app/src/main/java/org/koitharu/kotatsu/core/model/MangaSource.kt
Unescape Escape View File

@ -26,7 +26,8 @@ enum class MangaSource(
YAOICHAN("Яой-тян", "ru", YaoiChanRepository::class.java), YAOICHAN("Яой-тян", "ru", YaoiChanRepository::class.java),
MANGATOWN("MangaTown", "en", MangaTownRepository::class.java), MANGATOWN("MangaTown", "en", MangaTownRepository::class.java),
MANGALIB("MangaLib", "ru", MangaLibRepository::class.java), MANGALIB("MangaLib", "ru", MangaLibRepository::class.java),
NUDEMOON("Nude-Moon", "ru", NudeMoonRepository::class.java),
// NUDEMOON("Nude-Moon", "ru", NudeMoonRepository::class.java),
MANGAREAD("MangaRead", "en", MangareadRepository::class.java), MANGAREAD("MangaRead", "en", MangareadRepository::class.java),
REMANGA("Remanga", "ru", RemangaRepository::class.java), REMANGA("Remanga", "ru", RemangaRepository::class.java),
HENTAILIB("HentaiLib", "ru", HentaiLibRepository::class.java); HENTAILIB("HentaiLib", "ru", HentaiLibRepository::class.java);

2
app/src/main/java/org/koitharu/kotatsu/core/parser/ParserModule.kt
Unescape Escape View File

@ -20,7 +20,7 @@ val parserModule
factory<MangaRepository>(named(MangaSource.YAOICHAN)) { YaoiChanRepository(get()) } factory<MangaRepository>(named(MangaSource.YAOICHAN)) { YaoiChanRepository(get()) }
factory<MangaRepository>(named(MangaSource.MANGATOWN)) { MangaTownRepository(get()) } factory<MangaRepository>(named(MangaSource.MANGATOWN)) { MangaTownRepository(get()) }
factory<MangaRepository>(named(MangaSource.MANGALIB)) { MangaLibRepository(get()) } factory<MangaRepository>(named(MangaSource.MANGALIB)) { MangaLibRepository(get()) }
factory<MangaRepository>(named(MangaSource.NUDEMOON)) { NudeMoonRepository(get()) } // factory<MangaRepository>(named(MangaSource.NUDEMOON)) { NudeMoonRepository(get()) }
factory<MangaRepository>(named(MangaSource.MANGAREAD)) { MangareadRepository(get()) } factory<MangaRepository>(named(MangaSource.MANGAREAD)) { MangareadRepository(get()) }
factory<MangaRepository>(named(MangaSource.REMANGA)) { RemangaRepository(get()) } factory<MangaRepository>(named(MangaSource.REMANGA)) { RemangaRepository(get()) }
factory<MangaRepository>(named(MangaSource.HENTAILIB)) { HentaiLibRepository(get()) } factory<MangaRepository>(named(MangaSource.HENTAILIB)) { HentaiLibRepository(get()) }

7
app/src/main/java/org/koitharu/kotatsu/core/parser/RemoteMangaRepository.kt
Unescape Escape View File

@ -1,6 +1,6 @@
package org.koitharu.kotatsu.core.parser package org.koitharu.kotatsu.core.parser
import android.net.Uri import okhttp3.HttpUrl.Companion.toHttpUrl
import org.koitharu.kotatsu.base.domain.MangaLoaderContext import org.koitharu.kotatsu.base.domain.MangaLoaderContext
import org.koitharu.kotatsu.core.model.MangaPage import org.koitharu.kotatsu.core.model.MangaPage
import org.koitharu.kotatsu.core.model.MangaSource import org.koitharu.kotatsu.core.model.MangaSource
@ -26,10 +26,9 @@ abstract class RemoteMangaRepository(
abstract fun onCreatePreferences(): Set<String> abstract fun onCreatePreferences(): Set<String>
protected fun generateUid(url: String): Long { protected fun generateUid(url: String): Long {
val uri = Uri.parse(url) val uri = url.toHttpUrl()
val path = uri.path ?: error("Cannot generate uid: bad uri \"$url\"")
val x = source.name.hashCode() val x = source.name.hashCode()
val y = path.hashCode() val y = "${uri.encodedPath}?${uri.query}".hashCode()
return (x.toLong() shl 32) or (y.toLong() and 0xffffffffL) return (x.toLong() shl 32) or (y.toLong() and 0xffffffffL)
} }

7
app/src/main/java/org/koitharu/kotatsu/core/parser/site/GroupleRepository.kt
Unescape Escape View File

@ -16,9 +16,10 @@ abstract class GroupleRepository(loaderContext: MangaLoaderContext) :
protected abstract val defaultDomain: String protected abstract val defaultDomain: String
override val sortOrders: Set<SortOrder> = EnumSet.of( override val sortOrders: Set<SortOrder> = EnumSet.of(
SortOrder.UPDATED, SortOrder.POPULARITY, SortOrder.UPDATED,
SortOrder.NEWEST, SortOrder.RATING SortOrder.POPULARITY,
//FIXME SortOrder.ALPHABETICAL SortOrder.NEWEST,
SortOrder.RATING
) )
override suspend fun getList( override suspend fun getList(

4
app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaLibRepository.kt
Unescape Escape View File

@ -5,6 +5,7 @@ import androidx.collection.arraySetOf
import org.json.JSONArray import org.json.JSONArray
import org.json.JSONObject import org.json.JSONObject
import org.koitharu.kotatsu.base.domain.MangaLoaderContext import org.koitharu.kotatsu.base.domain.MangaLoaderContext
import org.koitharu.kotatsu.core.exceptions.AuthRequiredException
import org.koitharu.kotatsu.core.exceptions.ParseException import org.koitharu.kotatsu.core.exceptions.ParseException
import org.koitharu.kotatsu.core.model.* import org.koitharu.kotatsu.core.model.*
import org.koitharu.kotatsu.core.parser.RemoteMangaRepository import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
@ -144,6 +145,9 @@ open class MangaLibRepository(loaderContext: MangaLoaderContext) :
override suspend fun getPages(chapter: MangaChapter): List<MangaPage> { override suspend fun getPages(chapter: MangaChapter): List<MangaPage> {
val doc = loaderContext.httpGet(chapter.url).parseHtml() val doc = loaderContext.httpGet(chapter.url).parseHtml()
if (doc.location()?.endsWith("/register") == true) {
throw AuthRequiredException("/login".inContextOf(doc))
}
val scripts = doc.head().select("script") val scripts = doc.head().select("script")
val pg = doc.body().getElementById("pg").html() val pg = doc.body().getElementById("pg").html()
.substringAfter('=') .substringAfter('=')

22
app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangareadRepository.kt
Unescape Escape View File

@ -49,7 +49,8 @@ class MangareadRepository(
Manga( Manga(
id = href.longHashCode(), id = href.longHashCode(),
url = href, url = href,
coverUrl = div.selectFirst("img").absUrl("src"), coverUrl = div.selectFirst("img").attr("data-srcset")
.split(',').firstOrNull()?.substringBeforeLast(' ').orEmpty(),
title = summary.selectFirst("h3").text(), title = summary.selectFirst("h3").text(),
rating = div.selectFirst("span.total_votes")?.ownText() rating = div.selectFirst("span.total_votes")?.ownText()
?.toFloatOrNull()?.div(5f) ?: -1f, ?.toFloatOrNull()?.div(5f) ?: -1f,
@ -75,13 +76,17 @@ class MangareadRepository(
override suspend fun getTags(): Set<MangaTag> { override suspend fun getTags(): Set<MangaTag> {
val domain = conf.getDomain(DOMAIN) val domain = conf.getDomain(DOMAIN)
val doc = loaderContext.httpGet("https://$domain/manga/").parseHtml() val doc = loaderContext.httpGet("https://$domain/manga/").parseHtml()
val root = doc.body().getElementById("main-sidebar") val root = doc.body().selectFirst("header")
.selectFirst(".genres_wrap") .selectFirst("ul.second-menu")
.selectFirst("ul") return root.select("li").mapNotNullToSet { li ->
return root.select("li").mapToSet { li ->
val a = li.selectFirst("a") val a = li.selectFirst("a")
val href = a.attr("href").removeSuffix("/")
.substringAfterLast("genres/", "")
if (href.isEmpty()) {
return@mapNotNullToSet null
}
MangaTag( MangaTag(
key = a.attr("href").removeSuffix("/").substringAfterLast('/'), key = href,
title = a.text(), title = a.text(),
source = MangaSource.MANGAREAD source = MangaSource.MANGAREAD
) )
@ -119,7 +124,8 @@ class MangareadRepository(
} ?: manga.tags, } ?: manga.tags,
description = root2.selectFirst("div.description-summary") description = root2.selectFirst("div.description-summary")
?.selectFirst("div.summary__content") ?.selectFirst("div.summary__content")
?.select("p")?.drop(1) ?.select("p")
?.filterNot { it.ownText().startsWith("A brief description") }
?.joinToString { it.html() }, ?.joinToString { it.html() },
chapters = doc2.select("li").asReversed().mapIndexed { i, li -> chapters = doc2.select("li").asReversed().mapIndexed { i, li ->
val a = li.selectFirst("a") val a = li.selectFirst("a")
@ -142,7 +148,7 @@ class MangareadRepository(
?: throw ParseException("Root not found") ?: throw ParseException("Root not found")
return root.select("div.page-break").map { div -> return root.select("div.page-break").map { div ->
val img = div.selectFirst("img") val img = div.selectFirst("img")
val url = img.absUrl("src") val url = img.absUrl("data-src")
MangaPage( MangaPage(
id = url.longHashCode(), id = url.longHashCode(),
url = url, url = url,

13
app/src/main/java/org/koitharu/kotatsu/core/parser/site/NudeMoonRepository.kt
Unescape Escape View File

@ -1,15 +1,6 @@
package org.koitharu.kotatsu.core.parser.site package org.koitharu.kotatsu.core.parser.site
import androidx.collection.arraySetOf /*
import org.koitharu.kotatsu.base.domain.MangaLoaderContext
import org.koitharu.kotatsu.core.exceptions.ParseException
import org.koitharu.kotatsu.core.model.*
import org.koitharu.kotatsu.core.parser.RemoteMangaRepository
import org.koitharu.kotatsu.core.prefs.SourceSettings
import org.koitharu.kotatsu.utils.ext.*
import java.util.*
import java.util.regex.Pattern
class NudeMoonRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext) { class NudeMoonRepository(loaderContext: MangaLoaderContext) : RemoteMangaRepository(loaderContext) {
override val source = MangaSource.NUDEMOON override val source = MangaSource.NUDEMOON
@ -153,4 +144,4 @@ class NudeMoonRepository(loaderContext: MangaLoaderContext) : RemoteMangaReposit
private const val DEFAULT_DOMAIN = "nude-moon.me" private const val DEFAULT_DOMAIN = "nude-moon.me"
private val pageUrlPatter = Pattern.compile(".*\\?page=[0-9]+$") private val pageUrlPatter = Pattern.compile(".*\\?page=[0-9]+$")
} }
} }*/

2
app/src/main/java/org/koitharu/kotatsu/core/parser/site/SelfMangaRepository.kt
Unescape Escape View File

@ -5,6 +5,6 @@ import org.koitharu.kotatsu.core.model.MangaSource
class SelfMangaRepository(loaderContext: MangaLoaderContext) : GroupleRepository(loaderContext) { class SelfMangaRepository(loaderContext: MangaLoaderContext) : GroupleRepository(loaderContext) {
override val defaultDomain = "selfmanga.ru" override val defaultDomain = "selfmanga.live"
override val source = MangaSource.SELFMANGA override val source = MangaSource.SELFMANGA
} }

2
app/src/main/java/org/koitharu/kotatsu/list/ui/model/ListModelConversionExt.kt
Unescape Escape View File

@ -1,6 +1,7 @@
package org.koitharu.kotatsu.list.ui.model package org.koitharu.kotatsu.list.ui.model
import org.koitharu.kotatsu.R import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.core.exceptions.AuthRequiredException
import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException
import org.koitharu.kotatsu.core.exceptions.resolve.ResolvableException import org.koitharu.kotatsu.core.exceptions.resolve.ResolvableException
import org.koitharu.kotatsu.core.model.Manga import org.koitharu.kotatsu.core.model.Manga
@ -58,6 +59,7 @@ fun Throwable.toErrorFooter() = ErrorFooter(
) )
private fun getErrorIcon(error: Throwable) = when (error) { private fun getErrorIcon(error: Throwable) = when (error) {
is AuthRequiredException,
is CloudFlareProtectedException -> R.drawable.ic_denied_large is CloudFlareProtectedException -> R.drawable.ic_denied_large
else -> R.drawable.ic_error_large else -> R.drawable.ic_error_large
} }

7
app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt
Unescape Escape View File

@ -45,10 +45,7 @@ import org.koitharu.kotatsu.utils.GridTouchHelper
import org.koitharu.kotatsu.utils.ScreenOrientationHelper import org.koitharu.kotatsu.utils.ScreenOrientationHelper
import org.koitharu.kotatsu.utils.ShareHelper import org.koitharu.kotatsu.utils.ShareHelper
import org.koitharu.kotatsu.utils.anim.Motion import org.koitharu.kotatsu.utils.anim.Motion
import org.koitharu.kotatsu.utils.ext.hasGlobalPoint import org.koitharu.kotatsu.utils.ext.*
import org.koitharu.kotatsu.utils.ext.hideAnimated
import org.koitharu.kotatsu.utils.ext.hitTest
import org.koitharu.kotatsu.utils.ext.showAnimated
class ReaderActivity : BaseFullscreenActivity<ActivityReaderBinding>(), class ReaderActivity : BaseFullscreenActivity<ActivityReaderBinding>(),
ChaptersDialog.OnChapterChangeListener, ChaptersDialog.OnChapterChangeListener,
@ -213,7 +210,7 @@ class ReaderActivity : BaseFullscreenActivity<ActivityReaderBinding>(),
private fun onError(e: Throwable) { private fun onError(e: Throwable) {
val dialog = AlertDialog.Builder(this) val dialog = AlertDialog.Builder(this)
.setTitle(R.string.error_occurred) .setTitle(R.string.error_occurred)
.setMessage(e.message) .setMessage(e.getDisplayMessage(resources))
.setPositiveButton(R.string.close, null) .setPositiveButton(R.string.close, null)
if (viewModel.content.value?.pages.isNullOrEmpty()) { if (viewModel.content.value?.pages.isNullOrEmpty()) {
dialog.setOnDismissListener { dialog.setOnDismissListener {

2
app/src/main/java/org/koitharu/kotatsu/settings/MainSettingsFragment.kt
Unescape Escape View File

@ -85,7 +85,7 @@ class MainSettingsFragment : BasePreferenceFragment(R.string.settings),
findPreference<PreferenceScreen>(AppSettings.KEY_REMOTE_SOURCES)?.run { findPreference<PreferenceScreen>(AppSettings.KEY_REMOTE_SOURCES)?.run {
val total = MangaSource.values().size - 1 val total = MangaSource.values().size - 1
summary = getString( summary = getString(
R.string.enabled_d_from_d, total - settings.hiddenSources.size, total R.string.enabled_d_of_d, total - settings.hiddenSources.size, total
) )
} }
} }

6
app/src/main/java/org/koitharu/kotatsu/utils/ext/CommonExt.kt
Unescape Escape View File

@ -4,10 +4,7 @@ import android.content.res.Resources
import android.util.Log import android.util.Log
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import org.koitharu.kotatsu.R import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.core.exceptions.CloudFlareProtectedException import org.koitharu.kotatsu.core.exceptions.*
import org.koitharu.kotatsu.core.exceptions.EmptyHistoryException
import org.koitharu.kotatsu.core.exceptions.UnsupportedFileException
import org.koitharu.kotatsu.core.exceptions.WrongPasswordException
import java.io.FileNotFoundException import java.io.FileNotFoundException
import java.net.SocketTimeoutException import java.net.SocketTimeoutException
@ -28,6 +25,7 @@ suspend inline fun <T, R> T.retryUntilSuccess(maxAttempts: Int, action: T.() ->
} }
fun Throwable.getDisplayMessage(resources: Resources) = when (this) { fun Throwable.getDisplayMessage(resources: Resources) = when (this) {
is AuthRequiredException -> resources.getString(R.string.auth_required)
is CloudFlareProtectedException -> resources.getString(R.string.captcha_required) is CloudFlareProtectedException -> resources.getString(R.string.captcha_required)
is UnsupportedOperationException -> resources.getString(R.string.operation_not_supported) is UnsupportedOperationException -> resources.getString(R.string.operation_not_supported)
is UnsupportedFileException -> resources.getString(R.string.text_file_not_supported) is UnsupportedFileException -> resources.getString(R.string.text_file_not_supported)

4
app/src/main/res/values-ru/strings.xml
Unescape Escape View File

@ -103,7 +103,7 @@
<string name="large_manga_save_confirm">В этой манге %s. Вы уверены, что хотите сохранить их все?</string> <string name="large_manga_save_confirm">В этой манге %s. Вы уверены, что хотите сохранить их все?</string>
<string name="save_manga">Сохранить мангу</string> <string name="save_manga">Сохранить мангу</string>
<string name="notifications">Уведомления</string> <string name="notifications">Уведомления</string>
<string name="enabled_d_from_d">Включено %1$d из %2$d</string> <string name="enabled_d_of_d">Включено %1$d из %2$d</string>
<string name="new_chapters">Новые главы</string> <string name="new_chapters">Новые главы</string>
<string name="show_notification_new_chapters">Уведомлять об обновлении манги, которую Вы читаете</string> <string name="show_notification_new_chapters">Уведомлять об обновлении манги, которую Вы читаете</string>
<string name="download">Загрузить</string> <string name="download">Загрузить</string>
@ -200,4 +200,6 @@
<string name="power_optimization_already_disabled">Отпимизация батареи уже отключена</string> <string name="power_optimization_already_disabled">Отпимизация батареи уже отключена</string>
<string name="new_chapters_checking">Проверка новых глав</string> <string name="new_chapters_checking">Проверка новых глав</string>
<string name="reverse">В обратном порядке</string> <string name="reverse">В обратном порядке</string>
<string name="sign_in">Войти</string>
<string name="auth_required">Для просмотра этого контента требуется авторизация</string>
</resources> </resources>

4
app/src/main/res/values/strings.xml
Unescape Escape View File

@ -104,7 +104,7 @@
<string name="large_manga_save_confirm">This manga has %s. Do you want to save all of it?</string> <string name="large_manga_save_confirm">This manga has %s. Do you want to save all of it?</string>
<string name="save_manga">Save manga</string> <string name="save_manga">Save manga</string>
<string name="notifications">Notifications</string> <string name="notifications">Notifications</string>
<string name="enabled_d_from_d" tools:ignore="PluralsCandidate">Enabled %1$d from %2$d</string> <string name="enabled_d_of_d" tools:ignore="PluralsCandidate">Enabled %1$d of %2$d</string>
<string name="new_chapters">New chapters</string> <string name="new_chapters">New chapters</string>
<string name="show_notification_new_chapters">Notify about updates of manga you are reading</string> <string name="show_notification_new_chapters">Notify about updates of manga you are reading</string>
<string name="download">Download</string> <string name="download">Download</string>
@ -202,4 +202,6 @@
<string name="disable_power_optimization">Disable power optimization</string> <string name="disable_power_optimization">Disable power optimization</string>
<string name="new_chapters_checking">New chapters checking</string> <string name="new_chapters_checking">New chapters checking</string>
<string name="reverse">Reverse</string> <string name="reverse">Reverse</string>
<string name="sign_in">Sign in</string>
<string name="auth_required">You should authorize to view this content</string>
</resources> </resources>

84
app/src/test/java/org/koitharu/kotatsu/parsers/RemoteRepositoryTest.kt
Unescape Escape View File

@ -17,6 +17,7 @@ import org.koitharu.kotatsu.core.model.MangaSource
import org.koitharu.kotatsu.core.network.UserAgentInterceptor import org.koitharu.kotatsu.core.network.UserAgentInterceptor
import org.koitharu.kotatsu.core.prefs.SourceSettings import org.koitharu.kotatsu.core.prefs.SourceSettings
import org.koitharu.kotatsu.utils.AssertX import org.koitharu.kotatsu.utils.AssertX
import org.koitharu.kotatsu.utils.ext.isDistinctBy
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
@RunWith(Parameterized::class) @RunWith(Parameterized::class)
@ -32,58 +33,93 @@ class RemoteRepositoryTest(source: MangaSource) : KoinTest {
@Test @Test
fun list() { fun list() {
val list = runBlocking { repo.getList(60) } val list = runBlocking { repo.getList(60) }
Assert.assertFalse(list.isEmpty()) Assert.assertFalse("List is empty", list.isEmpty())
Assert.assertTrue("Mangas are not distinct", list.isDistinctBy { it.id })
val item = list.random() val item = list.random()
AssertX.assertContentType(item.coverUrl, "image/*") AssertX.assertContentType("Bad cover at ${item.url}", item.coverUrl, "image/*")
AssertX.assertContentType(item.url, "text/html", "application/json") AssertX.assertContentType(
Assert.assertFalse(item.title.isBlank()) "Wrong content type at ${item.url}",
item.url,
"text/html",
"application/json"
)
Assert.assertFalse("Title is blank at ${item.url}", item.title.isBlank())
} }
@Test @Test
fun search() { fun search() {
val list = runBlocking { repo.getList(0, query = "tail") } val list = runBlocking { repo.getList(0, query = "tail") }
Assert.assertFalse(list.isEmpty()) Assert.assertFalse("List is empty", list.isEmpty())
Assert.assertTrue("Mangas are not distinct", list.isDistinctBy { it.id })
val item = list.random() val item = list.random()
AssertX.assertContentType(item.coverUrl, "image/*") AssertX.assertContentType("Bad cover at ${item.url}", item.coverUrl, "image/*")
AssertX.assertContentType(item.url, "text/html", "application/json") AssertX.assertContentType(
Assert.assertFalse(item.title.isBlank()) "Wrong content type at ${item.url}",
item.url,
"text/html",
"application/json"
)
Assert.assertFalse("Title is blank at ${item.url}", item.title.isBlank())
} }
@Test @Test
fun tags() { fun tags() {
val tags = runBlocking { repo.getTags() } val tags = runBlocking { repo.getTags() }
Assert.assertFalse(tags.isEmpty()) Assert.assertFalse("No tags found", tags.isEmpty())
val tag = tags.random() val tag = tags.random()
Assert.assertFalse(tag.key.isBlank()) Assert.assertFalse("Tag title is blank for ${tag}", tag.key.isBlank())
Assert.assertFalse(tag.title.isBlank()) Assert.assertFalse("Tag title is blank for ${tag}", tag.title.isBlank())
val list = runBlocking { repo.getList(0, tag = tag) } val list = runBlocking { repo.getList(0, tag = tag) }
Assert.assertFalse(list.isEmpty()) Assert.assertFalse("List is empty", list.isEmpty())
val item = list.random() val item = list.random()
AssertX.assertContentType(item.coverUrl, "image/*") AssertX.assertContentType("Bad cover at ${item.coverUrl}", item.coverUrl, "image/*")
AssertX.assertContentType(item.url, "text/html", "application/json") AssertX.assertContentType(
Assert.assertFalse(item.title.isBlank()) "Wrong response from ${item.url}",
item.url,
"text/html",
"application/json"
)
Assert.assertFalse("Title is blank at ${item.url}", item.title.isBlank())
} }
@Test @Test
fun details() { fun details() {
val manga = runBlocking { repo.getList(0) }.random() val manga = runBlocking { repo.getList(0) }.random()
val details = runBlocking { repo.getDetails(manga) } val details = runBlocking { repo.getDetails(manga) }
Assert.assertFalse(details.chapters.isNullOrEmpty()) Assert.assertFalse("Chapter is empty at ${details.url}", details.chapters.isNullOrEmpty())
Assert.assertFalse(details.description.isNullOrEmpty()) Assert.assertFalse(
val chapter = details.chapters!!.random() "Description is empty at ${details.url}",
Assert.assertFalse(chapter.name.isBlank()) details.description.isNullOrEmpty()
AssertX.assertContentType(chapter.url, "text/html", "application/json") )
Assert.assertTrue(
"Chapters are not distinct",
details.chapters.orEmpty().isDistinctBy { it.id })
val chapter = details.chapters?.randomOrNull() ?: return
Assert.assertFalse(
"Chapter name missing at ${details.url}:${chapter.number}",
chapter.name.isBlank()
)
AssertX.assertContentType(
"Chapter response wrong at ${chapter.url}",
chapter.url,
"text/html",
"application/json"
)
} }
@Test @Test
fun pages() { fun pages() {
val manga = runBlocking { repo.getList(0) }.random() val manga = runBlocking { repo.getList(0) }.random()
val details = runBlocking { repo.getDetails(manga) } val details = runBlocking { repo.getDetails(manga) }
val pages = runBlocking { repo.getPages(details.chapters!!.random()) } val chapter = checkNotNull(details.chapters?.randomOrNull()) {
Assert.assertFalse(pages.isEmpty()) "No chapters at ${details.url}"
val page = pages.random() }
val pages = runBlocking { repo.getPages(chapter) }
Assert.assertFalse("Cannot find any page at ${chapter.url}", pages.isEmpty())
Assert.assertTrue("Pages are not distinct", pages.isDistinctBy { it.id })
val page = pages.randomOrNull() ?: return
val fullUrl = runBlocking { repo.getPageUrl(page) } val fullUrl = runBlocking { repo.getPageUrl(page) }
AssertX.assertContentType(fullUrl, "image/*") AssertX.assertContentType("Wrong page response from $fullUrl", fullUrl, "image/*")
} }
companion object { companion object {

16
app/src/test/java/org/koitharu/kotatsu/parsers/TemporaryCookieJar.kt
Unescape Escape View File

@ -3,17 +3,25 @@ package org.koitharu.kotatsu.parsers
import okhttp3.Cookie import okhttp3.Cookie
import okhttp3.CookieJar import okhttp3.CookieJar
import okhttp3.HttpUrl import okhttp3.HttpUrl
import org.koitharu.kotatsu.core.network.cookies.cache.SetCookieCache
class TemporaryCookieJar : CookieJar { class TemporaryCookieJar : CookieJar {
private val cache = SetCookieCache() private val cache = HashMap<CookieKey, Cookie>()
override fun loadForRequest(url: HttpUrl): List<Cookie> { override fun loadForRequest(url: HttpUrl): List<Cookie> {
return cache.toList() val time = System.currentTimeMillis()
return cache.values.filter { it.matches(url) && it.expiresAt < time }
} }
override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) { override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) {
cache.addAll(cookies) cookies.forEach {
val key = CookieKey(url.host, it.name)
cache[key] = it
} }
} }
private data class CookieKey(
val host: String,
val name: String
)
}

10
app/src/test/java/org/koitharu/kotatsu/utils/AssertX.kt
Unescape Escape View File

@ -11,18 +11,14 @@ object AssertX : KoinComponent {
private val okHttp by inject<OkHttpClient>() private val okHttp by inject<OkHttpClient>()
fun assertContentType(url: String, vararg types: String) { fun assertContentType(message: String, url: String, vararg types: String) {
Assert.assertFalse("URL is empty", url.isEmpty()) Assert.assertFalse("URL is empty: $message", url.isEmpty())
val request = Request.Builder() val request = Request.Builder()
.url(url) .url(url)
.head() .head()
.build() .build()
val response = okHttp.newCall(request).execute() val response = okHttp.newCall(request).execute()
when (val code = response.code) { when (val code = response.code) {
/*HttpURLConnection.HTTP_MOVED_PERM,
HttpURLConnection.HTTP_MOVED_TEMP -> {
assertContentType(cn.getHeaderField("Location"), *types)
}*/
HttpURLConnection.HTTP_OK -> { HttpURLConnection.HTTP_OK -> {
val type = response.body!!.contentType() val type = response.body!!.contentType()
Assert.assertTrue(types.any { Assert.assertTrue(types.any {
@ -30,7 +26,7 @@ object AssertX : KoinComponent {
type?.type == x[0] && (x[1] == "*" || type.subtype == x[1]) type?.type == x[0] && (x[1] == "*" || type.subtype == x[1])
}) })
} }
else -> Assert.fail("Invalid response code $code at $url") else -> Assert.fail("Invalid response code $code at $url: $message")
} }
} }

2
build.gradle
Unescape Escape View File

@ -6,7 +6,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.1' classpath 'com.android.tools.build:gradle:4.1.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong

Write Preview
Loading…
Cancel
Save