mirror of
https://github.com/mihonapp/mihon.git
synced 2025-02-22 15:04:14 +01:00
Compare commits
3 Commits
339dc33f58
...
1e570bc965
Author | SHA1 | Date | |
---|---|---|---|
|
1e570bc965 | ||
|
9cc7d42dd9 | ||
|
f5c6d2e1a6 |
@ -2,7 +2,6 @@ package eu.kanade.presentation.util
|
|||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import eu.kanade.tachiyomi.network.HttpException
|
import eu.kanade.tachiyomi.network.HttpException
|
||||||
import eu.kanade.tachiyomi.source.online.LicensedMangaChaptersException
|
|
||||||
import eu.kanade.tachiyomi.util.system.isOnline
|
import eu.kanade.tachiyomi.util.system.isOnline
|
||||||
import tachiyomi.core.common.i18n.stringResource
|
import tachiyomi.core.common.i18n.stringResource
|
||||||
import tachiyomi.data.source.NoResultsException
|
import tachiyomi.data.source.NoResultsException
|
||||||
@ -25,7 +24,6 @@ val Throwable.formattedMessage: String
|
|||||||
|
|
||||||
is NoResultsException -> return stringResource(MR.strings.no_results_found)
|
is NoResultsException -> return stringResource(MR.strings.no_results_found)
|
||||||
is SourceNotInstalledException -> return stringResource(MR.strings.loader_not_implemented_error)
|
is SourceNotInstalledException -> return stringResource(MR.strings.loader_not_implemented_error)
|
||||||
is LicensedMangaChaptersException -> return stringResource(MR.strings.licensed_manga_chapters_error)
|
|
||||||
}
|
}
|
||||||
return when (val className = this::class.simpleName) {
|
return when (val className = this::class.simpleName) {
|
||||||
"Exception", "IOException" -> message ?: className
|
"Exception", "IOException" -> message ?: className
|
||||||
|
@ -25,7 +25,7 @@ data class KitsuListSearchResult(
|
|||||||
title = manga.canonicalTitle
|
title = manga.canonicalTitle
|
||||||
total_chapters = manga.chapterCount ?: 0
|
total_chapters = manga.chapterCount ?: 0
|
||||||
cover_url = manga.posterImage?.original ?: ""
|
cover_url = manga.posterImage?.original ?: ""
|
||||||
summary = manga.synopsis
|
summary = manga.synopsis ?: ""
|
||||||
tracking_url = KitsuApi.mangaUrl(remote_id)
|
tracking_url = KitsuApi.mangaUrl(remote_id)
|
||||||
publishing_status = manga.status
|
publishing_status = manga.status
|
||||||
publishing_type = manga.mangaType ?: ""
|
publishing_type = manga.mangaType ?: ""
|
||||||
@ -73,7 +73,7 @@ data class KitsuListSearchItemIncludedAttributes(
|
|||||||
val chapterCount: Long?,
|
val chapterCount: Long?,
|
||||||
val mangaType: String?,
|
val mangaType: String?,
|
||||||
val posterImage: KitsuSearchItemCover?,
|
val posterImage: KitsuSearchItemCover?,
|
||||||
val synopsis: String,
|
val synopsis: String?,
|
||||||
val startDate: String?,
|
val startDate: String?,
|
||||||
val status: String,
|
val status: String,
|
||||||
)
|
)
|
||||||
|
@ -32,7 +32,7 @@ jsoup = "org.jsoup:jsoup:1.18.1"
|
|||||||
|
|
||||||
disklrucache = "com.jakewharton:disklrucache:2.0.2"
|
disklrucache = "com.jakewharton:disklrucache:2.0.2"
|
||||||
unifile = "com.github.tachiyomiorg:unifile:e0def6b3dc"
|
unifile = "com.github.tachiyomiorg:unifile:e0def6b3dc"
|
||||||
libarchive = "me.zhanghai.android.libarchive:library:1.1.0"
|
libarchive = "me.zhanghai.android.libarchive:library:1.1.1"
|
||||||
|
|
||||||
sqlite-framework = { module = "androidx.sqlite:sqlite-framework", version.ref = "sqlite" }
|
sqlite-framework = { module = "androidx.sqlite:sqlite-framework", version.ref = "sqlite" }
|
||||||
sqlite-ktx = { module = "androidx.sqlite:sqlite-ktx", version.ref = "sqlite" }
|
sqlite-ktx = { module = "androidx.sqlite:sqlite-ktx", version.ref = "sqlite" }
|
||||||
|
@ -647,7 +647,6 @@
|
|||||||
<!-- missing prompt after Compose rewrite #7901 -->
|
<!-- missing prompt after Compose rewrite #7901 -->
|
||||||
<string name="no_more_results">No more results</string>
|
<string name="no_more_results">No more results</string>
|
||||||
<string name="no_results_found">No results found</string>
|
<string name="no_results_found">No results found</string>
|
||||||
<string name="licensed_manga_chapters_error">Licensed - No chapters to show</string>
|
|
||||||
<string name="local_source">Local source</string>
|
<string name="local_source">Local source</string>
|
||||||
<string name="other_source">Other</string>
|
<string name="other_source">Other</string>
|
||||||
<string name="last_used_source">Last used</string>
|
<string name="last_used_source">Last used</string>
|
||||||
|
@ -251,28 +251,19 @@ abstract class HttpSource : CatalogueSource {
|
|||||||
*
|
*
|
||||||
* @param manga the manga to update.
|
* @param manga the manga to update.
|
||||||
* @return the chapters for the manga.
|
* @return the chapters for the manga.
|
||||||
* @throws LicensedMangaChaptersException if a manga is licensed and therefore no chapters are available.
|
|
||||||
*/
|
*/
|
||||||
@Suppress("DEPRECATION")
|
@Suppress("DEPRECATION")
|
||||||
override suspend fun getChapterList(manga: SManga): List<SChapter> {
|
override suspend fun getChapterList(manga: SManga): List<SChapter> {
|
||||||
if (manga.status == SManga.LICENSED) {
|
|
||||||
throw LicensedMangaChaptersException()
|
|
||||||
}
|
|
||||||
|
|
||||||
return fetchChapterList(manga).awaitSingle()
|
return fetchChapterList(manga).awaitSingle()
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getChapterList"))
|
@Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getChapterList"))
|
||||||
override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> {
|
override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> {
|
||||||
return if (manga.status != SManga.LICENSED) {
|
return client.newCall(chapterListRequest(manga))
|
||||||
client.newCall(chapterListRequest(manga))
|
.asObservableSuccess()
|
||||||
.asObservableSuccess()
|
.map { response ->
|
||||||
.map { response ->
|
chapterListParse(response)
|
||||||
chapterListParse(response)
|
}
|
||||||
}
|
|
||||||
} else {
|
|
||||||
Observable.error(LicensedMangaChaptersException())
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -472,5 +463,3 @@ abstract class HttpSource : CatalogueSource {
|
|||||||
*/
|
*/
|
||||||
override fun getFilterList() = FilterList()
|
override fun getFilterList() = FilterList()
|
||||||
}
|
}
|
||||||
|
|
||||||
class LicensedMangaChaptersException : RuntimeException()
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user