Fix ExceptionInInitializerException

2023-07-15 17:09:04 -04:00
parent f003c95eab
commit eade3c372c
33 changed files with 31 additions and 59 deletions
@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.source.model

-import exh.metadata.metadata.base.RaisedSearchMetadata
+import exh.metadata.metadata.RaisedSearchMetadata

 /* SY --> */
 open /* SY <-- */ class MangasPage(open val mangas: List<SManga>, open val hasNextPage: Boolean) {
@@ -3,7 +3,7 @@ package eu.kanade.tachiyomi.source.online
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.model.MangasPage
 import eu.kanade.tachiyomi.source.model.SManga
-import exh.metadata.metadata.base.RaisedSearchMetadata
+import exh.metadata.metadata.RaisedSearchMetadata

 interface FollowsSource : CatalogueSource {
    suspend fun fetchFollows(page: Int): MangasPage
@@ -2,8 +2,8 @@ package eu.kanade.tachiyomi.source.online

 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.model.SManga
+import exh.metadata.metadata.RaisedSearchMetadata
 import exh.metadata.metadata.base.FlatMetadata
-import exh.metadata.metadata.base.RaisedSearchMetadata
 import rx.Completable
 import rx.Single
 import tachiyomi.core.util.lang.awaitSingle
@@ -6,7 +6,6 @@ import eu.kanade.tachiyomi.source.R
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.model.copy
 import exh.metadata.MetadataUtil
-import exh.metadata.metadata.base.RaisedSearchMetadata
 import exh.pref.DelegateSourcePreferences
 import kotlinx.serialization.Serializable
 import uy.kohesive.injekt.Injekt
@@ -4,7 +4,6 @@ import android.content.Context
 import eu.kanade.tachiyomi.source.R
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.model.copy
-import exh.metadata.metadata.base.RaisedSearchMetadata
 import exh.util.nullIfEmpty
 import kotlinx.serialization.Serializable

@@ -4,7 +4,6 @@ import android.content.Context
 import eu.kanade.tachiyomi.source.R
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.model.copy
-import exh.metadata.metadata.base.RaisedSearchMetadata
 import kotlinx.serialization.Serializable

@Serializable
@@ -5,7 +5,6 @@ import eu.kanade.tachiyomi.source.R
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.model.copy
 import exh.md.utils.MangaDexRelation
-import exh.metadata.metadata.base.RaisedSearchMetadata
 import kotlinx.serialization.Serializable

@Serializable
@@ -5,7 +5,6 @@ import eu.kanade.tachiyomi.source.R
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.model.copy
 import exh.metadata.MetadataUtil
-import exh.metadata.metadata.base.RaisedSearchMetadata
 import kotlinx.serialization.Serializable
 import java.util.Date

@@ -4,7 +4,6 @@ import android.content.Context
 import eu.kanade.tachiyomi.source.R
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.model.copy
-import exh.metadata.metadata.base.RaisedSearchMetadata
 import kotlinx.serialization.Serializable

@Serializable
@@ -1,32 +1,23 @@
-package exh.metadata.metadata.base
+package exh.metadata.metadata

 import android.content.Context
 import eu.kanade.tachiyomi.source.model.SManga
-import exh.metadata.metadata.EHentaiSearchMetadata
-import exh.metadata.metadata.EightMusesSearchMetadata
-import exh.metadata.metadata.HBrowseSearchMetadata
-import exh.metadata.metadata.MangaDexSearchMetadata
-import exh.metadata.metadata.NHentaiSearchMetadata
-import exh.metadata.metadata.PururinSearchMetadata
-import exh.metadata.metadata.TsuminoSearchMetadata
+import exh.metadata.metadata.base.FlatMetadata
+import exh.metadata.metadata.base.RaisedTag
+import exh.metadata.metadata.base.RaisedTitle
 import exh.metadata.sql.models.SearchMetadata
 import exh.metadata.sql.models.SearchTag
 import exh.metadata.sql.models.SearchTitle
 import exh.util.plusAssign
-import kotlinx.serialization.Polymorphic
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.modules.SerializersModule
-import kotlinx.serialization.modules.polymorphic
-import kotlinx.serialization.modules.subclass
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty

-@Polymorphic
@Serializable
-abstract class RaisedSearchMetadata {
+sealed class RaisedSearchMetadata {
    @Transient
    var mangaId: Long = -1

@@ -156,21 +147,8 @@ abstract class RaisedSearchMetadata {
            this.filter { it.type != TAG_TYPE_VIRTUAL }
                .map { (if (it.namespace != null) "${it.namespace}: " else "") + it.name }

-        private val module = SerializersModule {
-            polymorphic(RaisedSearchMetadata::class) {
-                subclass(EHentaiSearchMetadata::class)
-                subclass(EightMusesSearchMetadata::class)
-                subclass(HBrowseSearchMetadata::class)
-                subclass(MangaDexSearchMetadata::class)
-                subclass(NHentaiSearchMetadata::class)
-                subclass(PururinSearchMetadata::class)
-                subclass(TsuminoSearchMetadata::class)
-            }
-        }
-
        val raiseFlattenJson = Json {
            ignoreUnknownKeys = true
-            serializersModule = module
        }

        fun titleDelegate(type: Int) = object : ReadWriteProperty<RaisedSearchMetadata, String?> {
@@ -6,7 +6,6 @@ import eu.kanade.tachiyomi.source.R
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.model.copy
 import exh.metadata.MetadataUtil
-import exh.metadata.metadata.base.RaisedSearchMetadata
 import exh.util.nullIfEmpty
 import kotlinx.serialization.Serializable
 import java.text.SimpleDateFormat
@@ -1,5 +1,6 @@
 package exh.metadata.metadata.base

+import exh.metadata.metadata.RaisedSearchMetadata
 import exh.metadata.sql.models.SearchMetadata
 import exh.metadata.sql.models.SearchTag
 import exh.metadata.sql.models.SearchTitle