null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle unimplented chapter urls

Browse source
This commit is contained in:
Jays2Kings 2023-02-16 17:04:56 -05:00
parent 98cba545a5
commit 480567419f
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/source/online/HttpSource.kt
View file

@ -398,7 +398,7 @@ abstract class HttpSource : CatalogueSource {
manga ?: return null
val chapterUrl = chapter.url.getUrlWithoutDomain()
val mangaUrl = mangaDetailsRequest(manga).url.toString()
val mangaUrl = getMangaUrl(manga)
return if (chapterUrl.isBlank()) {
mangaUrl
} else {

4
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt
View file

@ -237,8 +237,8 @@ class MangaDetailsPresenter(
fun getChapterUrl(chapter: Chapter): String? {
val source = source as? HttpSource ?: return null
val chapterUrl = source.getChapterUrl(chapter)
return chapterUrl.takeIf { it.isNotEmpty() } ?: source.getChapterUrl(manga, chapter)
val chapterUrl = try { source.getChapterUrl(chapter) } catch (_: Exception) { null }
return chapterUrl.takeIf { !it.isNullOrBlank() } ?: source.getChapterUrl(manga, chapter)
}
private fun getScrollType(chapters: List<ChapterItem>) {

4
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
View file

@ -637,8 +637,8 @@ class ReaderViewModel(
val manga = manga ?: return null
val source = getSource() ?: return null
val chapter = getCurrentChapter()?.chapter ?: return null
val chapterUrl = source.getChapterUrl(chapter)
return chapterUrl.takeIf { it.isNotEmpty() } ?: source.getChapterUrl(manga, chapter)
val chapterUrl = try { source.getChapterUrl(chapter) } catch (_: Exception) { null }
return chapterUrl.takeIf { !it.isNullOrBlank() } ?: source.getChapterUrl(manga, chapter)
}
fun getSource() = manga?.source?.let { sourceManager.getOrStub(it) } as? HttpSource