From 931b7c8b8b1c070bf1199f7cc035953eeaf2a2cd Mon Sep 17 00:00:00 2001 From: Cuong-Tran Date: Tue, 25 Feb 2025 16:56:39 +0700 Subject: [PATCH] correct non-nullable of TrackMangaMetadata & MUContext --- .../java/eu/kanade/tachiyomi/data/track/BaseTracker.kt | 2 +- .../java/eu/kanade/tachiyomi/data/track/Tracker.kt | 2 +- .../eu/kanade/tachiyomi/data/track/anilist/Anilist.kt | 3 +-- .../kanade/tachiyomi/data/track/anilist/AnilistApi.kt | 10 ++++++---- .../eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt | 2 +- .../tachiyomi/data/track/mangaupdates/MangaUpdates.kt | 4 ++-- .../data/track/mangaupdates/MangaUpdatesApi.kt | 2 +- .../eu/kanade/tachiyomi/data/track/mdlist/MdList.kt | 2 +- .../tachiyomi/data/track/myanimelist/MyAnimeList.kt | 3 +-- .../kanade/tachiyomi/data/track/shikimori/Shikimori.kt | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/BaseTracker.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/BaseTracker.kt index ce98908ae..b5b95345e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/BaseTracker.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/BaseTracker.kt @@ -121,7 +121,7 @@ abstract class BaseTracker( updateRemote(track) } - override suspend fun getMangaMetadata(track: DomainTrack): TrackMangaMetadata? { + override suspend fun getMangaMetadata(track: DomainTrack): TrackMangaMetadata { throw NotImplementedError("Not implemented.") } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/Tracker.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/Tracker.kt index 86d48189f..0f7dec9fe 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/Tracker.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/Tracker.kt @@ -84,7 +84,7 @@ interface Tracker { suspend fun setRemoteFinishDate(track: Track, epochMillis: Long) - suspend fun getMangaMetadata(track: DomainTrack): TrackMangaMetadata? + suspend fun getMangaMetadata(track: DomainTrack): TrackMangaMetadata // KMK --> fun hasNotStartedReading(status: Long): Boolean diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt index 84c888e11..7a8179a21 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt @@ -13,7 +13,6 @@ import eu.kanade.tachiyomi.data.track.model.TrackSearch import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf import kotlinx.collections.immutable.toImmutableList -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import tachiyomi.i18n.MR import uy.kohesive.injekt.injectLazy @@ -233,7 +232,7 @@ class Anilist(id: Long) : BaseTracker(id, "AniList"), DeletableTracker { interceptor.setAuth(null) } - override suspend fun getMangaMetadata(track: DomainTrack): TrackMangaMetadata? { + override suspend fun getMangaMetadata(track: DomainTrack): TrackMangaMetadata { return api.getMangaMetadata(track) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt index 08ad2eed3..4ad65920f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/AnilistApi.kt @@ -342,13 +342,15 @@ class AnilistApi(val client: OkHttpClient, interceptor: AnilistInterceptor) { description = media.description?.htmlDecode()?.ifEmpty { null }, authors = media.staff.edges .filter { it.role == "Story" || it.role == "Story & Art" } - .map { it.node.name.userPreferred } - .joinToString(", ") + // KMK --> + .joinToString(", ") { it.node.name.userPreferred } + // KMK <-- .ifEmpty { null }, artists = media.staff.edges .filter { it.role == "Art" || it.role == "Story & Art" } - .map { it.node.name.userPreferred } - .joinToString(", ") + // KMK --> + .joinToString(", ") { it.node.name.userPreferred } + // KMK <-- .ifEmpty { null }, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt index e2f0d3c47..503601f6e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt @@ -72,7 +72,7 @@ class Bangumi(id: Long) : BaseTracker(id, "Bangumi") { return api.search(query) } - override suspend fun getMangaMetadata(track: DomainTrack): TrackMangaMetadata? { + override suspend fun getMangaMetadata(track: DomainTrack): TrackMangaMetadata { return api.getMangaMetadata(track) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdates.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdates.kt index cad5a55e9..a7eac4701 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdates.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdates.kt @@ -119,9 +119,9 @@ class MangaUpdates(id: Long) : BaseTracker(id, "MangaUpdates"), DeletableTracker interceptor.newAuth(authenticated.sessionToken) } - override suspend fun getMangaMetadata(track: DomainTrack): TrackMangaMetadata? { + override suspend fun getMangaMetadata(track: DomainTrack): TrackMangaMetadata { val series = api.getSeries(track) - return series?.let { + return series.let { TrackMangaMetadata( it.seriesId, it.title?.htmlDecode(), diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdatesApi.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdatesApi.kt index 8f85e9a5b..fcb04c914 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdatesApi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdatesApi.kt @@ -172,7 +172,7 @@ class MangaUpdatesApi( } } - suspend fun authenticate(username: String, password: String): MUContext? { + suspend fun authenticate(username: String, password: String): MUContext { val body = buildJsonObject { put("username", username) put("password", password) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt index 497f378a2..522e97a0e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt @@ -172,7 +172,7 @@ class MdList(id: Long) : BaseTracker(id, "MDList") { trackPreferences.trackToken(this).delete() } - override suspend fun getMangaMetadata(track: DomainTrack): TrackMangaMetadata? { + override suspend fun getMangaMetadata(track: DomainTrack): TrackMangaMetadata { return withIOContext { val mdex = mdex ?: throw MangaDexNotFoundException() val manga = mdex.getMangaMetadata(track.toDbTrack()) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt index 60a825d12..14ac1ae27 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt @@ -11,7 +11,6 @@ import eu.kanade.tachiyomi.data.track.model.TrackSearch import eu.kanade.tachiyomi.data.track.myanimelist.dto.MALOAuth import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.toImmutableList -import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import tachiyomi.i18n.MR import uy.kohesive.injekt.injectLazy @@ -157,7 +156,7 @@ class MyAnimeList(id: Long) : BaseTracker(id, "MyAnimeList"), DeletableTracker { interceptor.setAuth(null) } - override suspend fun getMangaMetadata(track: DomainTrack): TrackMangaMetadata? { + override suspend fun getMangaMetadata(track: DomainTrack): TrackMangaMetadata { return api.getMangaMetadata(track) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt index 1e8dd0ccd..f1f475f0b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt @@ -99,7 +99,7 @@ class Shikimori(id: Long) : BaseTracker(id, "Shikimori"), DeletableTracker { return track } - override suspend fun getMangaMetadata(track: DomainTrack): TrackMangaMetadata? { + override suspend fun getMangaMetadata(track: DomainTrack): TrackMangaMetadata { return api.getMangaMetadata(track) }