Fix ExceptionInInitializerException

app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt

@@ -25,7 +25,7 @@ import eu.kanade.presentation.components.AppBar
 import eu.kanade.presentation.util.formattedMessage
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.source.Source
-import exh.metadata.metadata.base.RaisedSearchMetadata
+import exh.metadata.metadata.RaisedSearchMetadata
 import exh.source.isEhBasedSource
 import kotlinx.coroutines.flow.StateFlow
 import tachiyomi.domain.library.model.LibraryDisplayMode

app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt

@@ -19,7 +19,7 @@ import eu.kanade.presentation.library.components.CommonMangaItemDefaults
 import eu.kanade.presentation.library.components.MangaComfortableGridItem
 import eu.kanade.tachiyomi.R
 import exh.metadata.metadata.MangaDexSearchMetadata
-import exh.metadata.metadata.base.RaisedSearchMetadata
+import exh.metadata.metadata.RaisedSearchMetadata
 import kotlinx.coroutines.flow.StateFlow
 import tachiyomi.domain.manga.model.Manga
 import tachiyomi.domain.manga.model.MangaCover

app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt

@@ -19,7 +19,7 @@ import eu.kanade.presentation.library.components.CommonMangaItemDefaults
 import eu.kanade.presentation.library.components.MangaCompactGridItem
 import eu.kanade.tachiyomi.R
 import exh.metadata.metadata.MangaDexSearchMetadata
-import exh.metadata.metadata.base.RaisedSearchMetadata
+import exh.metadata.metadata.RaisedSearchMetadata
 import kotlinx.coroutines.flow.StateFlow
 import tachiyomi.domain.manga.model.Manga
 import tachiyomi.domain.manga.model.MangaCover

app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceEHentaiList.kt

@@ -36,7 +36,7 @@ import eu.kanade.presentation.manga.components.MangaCover
 import eu.kanade.tachiyomi.R
 import exh.metadata.MetadataUtil
 import exh.metadata.metadata.EHentaiSearchMetadata
-import exh.metadata.metadata.base.RaisedSearchMetadata
+import exh.metadata.metadata.RaisedSearchMetadata
 import exh.util.SourceTagsUtil
 import exh.util.SourceTagsUtil.GenreColor
 import exh.util.floor

app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt

@@ -15,7 +15,7 @@ import eu.kanade.presentation.library.components.CommonMangaItemDefaults
 import eu.kanade.presentation.library.components.MangaListItem
 import eu.kanade.tachiyomi.R
 import exh.metadata.metadata.MangaDexSearchMetadata
-import exh.metadata.metadata.base.RaisedSearchMetadata
+import exh.metadata.metadata.RaisedSearchMetadata
 import kotlinx.coroutines.flow.StateFlow
 import tachiyomi.domain.manga.model.Manga
 import tachiyomi.domain.manga.model.MangaCover

app/src/main/java/eu/kanade/presentation/manga/components/NamespaceTags.kt

@@ -27,7 +27,7 @@ import eu.kanade.presentation.theme.TachiyomiTheme
 import eu.kanade.tachiyomi.source.Source
 import eu.kanade.tachiyomi.source.online.all.EHentai
 import exh.metadata.metadata.EHentaiSearchMetadata
-import exh.metadata.metadata.base.RaisedSearchMetadata
+import exh.metadata.metadata.RaisedSearchMetadata
 import exh.metadata.metadata.base.RaisedTag
 import exh.source.EH_SOURCE_ID
 import exh.source.EXH_SOURCE_ID

app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt

@@ -41,8 +41,8 @@ import exh.metadata.metadata.EHentaiSearchMetadata.Companion.EH_VISIBILITY_NAMES
 import exh.metadata.metadata.EHentaiSearchMetadata.Companion.TAG_TYPE_LIGHT
 import exh.metadata.metadata.EHentaiSearchMetadata.Companion.TAG_TYPE_NORMAL
 import exh.metadata.metadata.EHentaiSearchMetadata.Companion.TAG_TYPE_WEAK
-import exh.metadata.metadata.base.RaisedSearchMetadata.Companion.TAG_TYPE_VIRTUAL
-import exh.metadata.metadata.base.RaisedSearchMetadata.Companion.toGenreString
+import exh.metadata.metadata.RaisedSearchMetadata.Companion.TAG_TYPE_VIRTUAL
+import exh.metadata.metadata.RaisedSearchMetadata.Companion.toGenreString
 import exh.metadata.metadata.base.RaisedTag
 import exh.ui.login.EhLoginActivity
 import exh.util.UriFilter

app/src/main/java/eu/kanade/tachiyomi/source/online/all/NHentai.kt

@@ -17,7 +17,7 @@ import eu.kanade.tachiyomi.source.online.MetadataSource
 import eu.kanade.tachiyomi.source.online.NamespaceSource
 import eu.kanade.tachiyomi.source.online.UrlImportableSource
 import exh.metadata.metadata.NHentaiSearchMetadata
-import exh.metadata.metadata.base.RaisedSearchMetadata
+import exh.metadata.metadata.RaisedSearchMetadata
 import exh.metadata.metadata.base.RaisedTag
 import exh.source.DelegatedHttpSource
 import exh.util.trimOrNull

app/src/main/java/eu/kanade/tachiyomi/source/online/english/Pururin.kt

@@ -13,7 +13,7 @@ import eu.kanade.tachiyomi.source.online.NamespaceSource
 import eu.kanade.tachiyomi.source.online.UrlImportableSource
 import eu.kanade.tachiyomi.util.asJsoup
 import exh.metadata.metadata.PururinSearchMetadata
-import exh.metadata.metadata.base.RaisedSearchMetadata
+import exh.metadata.metadata.RaisedSearchMetadata
 import exh.metadata.metadata.base.RaisedTag
 import exh.source.DelegatedHttpSource
 import exh.util.dropBlank

app/src/main/java/eu/kanade/tachiyomi/source/online/english/Tsumino.kt

@@ -11,9 +11,9 @@ import eu.kanade.tachiyomi.source.online.MetadataSource
 import eu.kanade.tachiyomi.source.online.NamespaceSource
 import eu.kanade.tachiyomi.source.online.UrlImportableSource
 import eu.kanade.tachiyomi.util.asJsoup
+import exh.metadata.metadata.RaisedSearchMetadata.Companion.TAG_TYPE_VIRTUAL
 import exh.metadata.metadata.TsuminoSearchMetadata
 import exh.metadata.metadata.TsuminoSearchMetadata.Companion.TAG_TYPE_DEFAULT
-import exh.metadata.metadata.base.RaisedSearchMetadata.Companion.TAG_TYPE_VIRTUAL
 import exh.metadata.metadata.base.RaisedTag
 import exh.source.DelegatedHttpSource
 import exh.util.dropBlank

app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt

@@ -31,7 +31,7 @@ import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.online.MetadataSource
 import eu.kanade.tachiyomi.source.online.all.MangaDex
 import eu.kanade.tachiyomi.util.removeCovers
-import exh.metadata.metadata.base.RaisedSearchMetadata
+import exh.metadata.metadata.RaisedSearchMetadata
 import exh.source.getMainSource
 import exh.source.mangaDexSourceIds
 import kotlinx.coroutines.flow.Flow

app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt

@@ -47,8 +47,8 @@ import exh.eh.EHentaiUpdateHelper
 import exh.log.xLogD
 import exh.md.utils.FollowStatus
 import exh.md.utils.MdUtil
+import exh.metadata.metadata.RaisedSearchMetadata
 import exh.metadata.metadata.base.FlatMetadata
-import exh.metadata.metadata.base.RaisedSearchMetadata
 import exh.source.MERGED_SOURCE_ID
 import exh.source.getMainSource
 import exh.source.isEhBasedManga

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

@@ -53,7 +53,7 @@ import eu.kanade.tachiyomi.util.storage.cacheImageDir
 import eu.kanade.tachiyomi.util.system.isOnline
 import exh.md.utils.FollowStatus
 import exh.md.utils.MdUtil
-import exh.metadata.metadata.base.RaisedSearchMetadata
+import exh.metadata.metadata.RaisedSearchMetadata
 import exh.source.MERGED_SOURCE_ID
 import exh.source.getMainSource
 import exh.source.isEhBasedManga

app/src/main/java/exh/md/follows/MangaDexFollowsScreenModel.kt

@@ -3,7 +3,7 @@ package exh.md.follows
 import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.online.all.MangaDex
 import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceScreenModel
-import exh.metadata.metadata.base.RaisedSearchMetadata
+import exh.metadata.metadata.RaisedSearchMetadata
 import exh.source.getMainSource
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map

app/src/main/java/exh/md/similar/MangaDexSimilarScreenModel.kt

@@ -3,7 +3,7 @@ package exh.md.similar
 import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.online.all.MangaDex
 import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceScreenModel
-import exh.metadata.metadata.base.RaisedSearchMetadata
+import exh.metadata.metadata.RaisedSearchMetadata
 import exh.source.getMainSource
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map

app/src/main/java/exh/ui/metadata/MetadataViewScreenModel.kt

@@ -3,7 +3,7 @@ package exh.ui.metadata
 import cafe.adriel.voyager.core.model.StateScreenModel
 import cafe.adriel.voyager.core.model.coroutineScope
 import eu.kanade.tachiyomi.source.online.MetadataSource
-import exh.metadata.metadata.base.RaisedSearchMetadata
+import exh.metadata.metadata.RaisedSearchMetadata
 import exh.source.getMainSource
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow

data/src/main/java/tachiyomi/data/source/EHentaiPagingSource.kt

@@ -5,7 +5,7 @@ import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.model.MangasPage
 import eu.kanade.tachiyomi.source.model.MetadataMangasPage
 import eu.kanade.tachiyomi.source.model.SManga
-import exh.metadata.metadata.base.RaisedSearchMetadata
+import exh.metadata.metadata.RaisedSearchMetadata
 import tachiyomi.core.util.lang.awaitSingle
 
 abstract class EHentaiPagingSource(override val source: CatalogueSource) : SourcePagingSource(source) {

data/src/main/java/tachiyomi/data/source/SourcePagingSource.kt

@@ -6,7 +6,7 @@ import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.model.MangasPage
 import eu.kanade.tachiyomi.source.model.MetadataMangasPage
 import eu.kanade.tachiyomi.source.model.SManga
-import exh.metadata.metadata.base.RaisedSearchMetadata
+import exh.metadata.metadata.RaisedSearchMetadata
 import tachiyomi.core.util.lang.awaitSingle
 import tachiyomi.core.util.lang.withIOContext
 import tachiyomi.domain.source.repository.SourcePagingSourceType

domain/src/main/java/tachiyomi/domain/manga/interactor/InsertFlatMetadata.kt

@@ -1,8 +1,8 @@
 package tachiyomi.domain.manga.interactor
 
 import eu.kanade.tachiyomi.source.online.MetadataSource
+import exh.metadata.metadata.RaisedSearchMetadata
 import exh.metadata.metadata.base.FlatMetadata
-import exh.metadata.metadata.base.RaisedSearchMetadata
 import logcat.LogPriority
 import tachiyomi.core.util.system.logcat
 import tachiyomi.domain.manga.repository.MangaMetadataRepository

domain/src/main/java/tachiyomi/domain/manga/repository/MangaMetadataRepository.kt

@@ -1,7 +1,7 @@
 package tachiyomi.domain.manga.repository
 
+import exh.metadata.metadata.RaisedSearchMetadata
 import exh.metadata.metadata.base.FlatMetadata
-import exh.metadata.metadata.base.RaisedSearchMetadata
 import exh.metadata.sql.models.SearchMetadata
 import exh.metadata.sql.models.SearchTag
 import exh.metadata.sql.models.SearchTitle

domain/src/main/java/tachiyomi/domain/source/repository/SourceRepository.kt

@@ -3,7 +3,7 @@ package tachiyomi.domain.source.repository
 import androidx.paging.PagingSource
 import eu.kanade.tachiyomi.source.model.FilterList
 import eu.kanade.tachiyomi.source.model.SManga
-import exh.metadata.metadata.base.RaisedSearchMetadata
+import exh.metadata.metadata.RaisedSearchMetadata
 import kotlinx.coroutines.flow.Flow
 import tachiyomi.domain.source.model.Source
 import tachiyomi.domain.source.model.SourceWithCount

source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/model/MangasPage.kt

@@ -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) {

source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/FollowsSource.kt

@@ -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

source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/MetadataSource.kt

@@ -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

source-api/src/commonMain/kotlin/exh/metadata/metadata/EHentaiSearchMetadata.kt

@@ -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

source-api/src/commonMain/kotlin/exh/metadata/metadata/EightMusesSearchMetadata.kt

@@ -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
 

source-api/src/commonMain/kotlin/exh/metadata/metadata/HBrowseSearchMetadata.kt

@@ -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

source-api/src/commonMain/kotlin/exh/metadata/metadata/MangaDexSearchMetadata.kt

@@ -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

source-api/src/commonMain/kotlin/exh/metadata/metadata/NHentaiSearchMetadata.kt

@@ -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
 

source-api/src/commonMain/kotlin/exh/metadata/metadata/PururinSearchMetadata.kt

@@ -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

source-api/src/commonMain/kotlin/exh/metadata/metadata/RaisedSearchMetadata.kt

@@ -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?> {

source-api/src/commonMain/kotlin/exh/metadata/metadata/TsuminoSearchMetadata.kt

@@ -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

source-api/src/commonMain/kotlin/exh/metadata/metadata/base/FlatMetadata.kt

@@ -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