Merge pull request #261 from gregoryn22/master

Fix MangaBaka provider crash when source fields are missing

Author: Snd-R

komf-core/build.gradle.kts

@@ -50,5 +50,8 @@ kotlin {
             implementation(libs.twelvemonkeys.imageio.jpeg)
             implementation(libs.twelvemonkeys.imageio.webp)
         }
+        commonTest.dependencies {
+            implementation(kotlin("test"))
+        }
     }
 }

komf-core/src/commonMain/kotlin/snd/komf/providers/mangabaka/MangaBakaSeries.kt

@@ -1,13 +1,7 @@
 package snd.komf.providers.mangabaka
 
-import kotlinx.serialization.KSerializer
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.descriptors.nullable
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
 import kotlin.time.Instant
 
 private const val baseUrl = "https://mangabaka.dev"
@@ -83,13 +77,13 @@ data class MangaBakaCover(
 
 @Serializable
 data class MangaBakaCoverRaw(
-    val url: String?,
-    val size: Long?,
-    val height: Int?,
-    val width: Int?,
-    val blurhash: String?,
-    val thumbhash: String?,
-    val format: String?,
+    val url: String? = null,
+    val size: Long? = null,
+    val height: Int? = null,
+    val width: Int? = null,
+    val blurhash: String? = null,
+    val thumbhash: String? = null,
+    val format: String? = null,
 )
 
 @Serializable
@@ -122,8 +116,8 @@ enum class MangaBakaStatus {
 
 @Serializable
 data class MangaBakaAnimeInfo(
-    val start: String?,
-    val end: String?
+    val start: String? = null,
+    val end: String? = null
 )
 
 @Serializable
@@ -173,15 +167,14 @@ data class MangaBakaRelationships(
 
 @Serializable
 data class MangaBakaSources(
-    val anilist: MangaBakaAnilistSource,
+    val anilist: MangaBakaAnilistSource? = null,
     @SerialName("anime_news_network")
-    val animeNewsNetwork: MangaBakaAnimeNewsNetworkSource,
-    val kitsu: MangaBakaKitsuSource,
+    val animeNewsNetwork: MangaBakaAnimeNewsNetworkSource? = null,
+    val kitsu: MangaBakaKitsuSource?,
     @SerialName("manga_updates")
-    val mangaUpdates: MangaBakaMangaUpdatesSource,
-    val mangadex: MangaBakaMangaDexSource,
+    val mangaUpdates: MangaBakaMangaUpdatesSource? = null,
     @SerialName("my_anime_list")
-    val myAnimeList: MangaBakaMyAnimeListSource,
+    val myAnimeList: MangaBakaMyAnimeListSource? = null,
 )
 
 @Serializable
@@ -208,12 +201,6 @@ data class MangaBakaMangaUpdatesSource(
     val rating: Double? = null,
 )
 
-@Serializable
-data class MangaBakaMangaDexSource(
-    val id: String? = null,
-    val rating: Double? = null,
-)
-
 @Serializable
 data class MangaBakaMyAnimeListSource(
     val id: Int? = null,

komf-core/src/commonMain/kotlin/snd/komf/providers/mangabaka/db/MangaBakaDbDataSource.kt

@@ -17,7 +17,6 @@ import snd.komf.providers.mangabaka.MangaBakaCoverDpi
 import snd.komf.providers.mangabaka.MangaBakaCoverRaw
 import snd.komf.providers.mangabaka.MangaBakaDataSource
 import snd.komf.providers.mangabaka.MangaBakaKitsuSource
-import snd.komf.providers.mangabaka.MangaBakaMangaDexSource
 import snd.komf.providers.mangabaka.MangaBakaMangaUpdatesSource
 import snd.komf.providers.mangabaka.MangaBakaMyAnimeListSource
 import snd.komf.providers.mangabaka.MangaBakaPublisher
@@ -150,10 +149,6 @@ class MangaBakaDbDataSource(
                     this[MangaBakaSeriesTable.sourceMangaUpdatesId],
                     this[MangaBakaSeriesTable.sourceMangaUpdatesRating]
                 ),
-                mangadex = MangaBakaMangaDexSource(
-                    this[MangaBakaSeriesTable.sourceMangaDexId],
-                    this[MangaBakaSeriesTable.sourceMangaDexRating]
-                ),
                 myAnimeList = MangaBakaMyAnimeListSource(
                     this[MangaBakaSeriesTable.sourceMyAnimeListId],
                     this[MangaBakaSeriesTable.sourceMyAnimeListRating]

komf-core/src/commonMain/kotlin/snd/komf/providers/mangabaka/db/MangaBakaSeriesTable.kt

@@ -47,8 +47,6 @@ object MangaBakaSeriesTable : Table("series") {
     val sourceAnilistRating = double("source_anilist_rating").nullable()
     val sourceAnimeNewNetworkId = integer("source_anime_news_network_id").nullable()
     val sourceAnimeNewNetworkRating = double("source_anime_news_network_rating").nullable()
-    val sourceMangaDexId = text("source_mangadex_id").nullable()
-    val sourceMangaDexRating = double("source_mangadex_rating").nullable()
     val sourceMangaUpdatesId = text("source_manga_updates_id").nullable()
     val sourceMangaUpdatesRating = double("source_manga_updates_rating").nullable()
     val sourceMyAnimeListId = integer("source_my_anime_list_id").nullable()