diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/config/ConfigKey.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/config/ConfigKey.kt index 8603ac62..62b8107b 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/config/ConfigKey.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/config/ConfigKey.kt @@ -1,14 +1,14 @@ package org.koitharu.kotatsu.parsers.config sealed class ConfigKey( - val key: String, + @JvmField val key: String, ) { abstract val defaultValue: T class Domain( override val defaultValue: String, - val presetValues: Array?, + @JvmField val presetValues: Array?, ) : ConfigKey("domain") class ShowSuspiciousContent( diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/model/Favicon.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/model/Favicon.kt index 7256524e..41e092ff 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/model/Favicon.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/model/Favicon.kt @@ -3,11 +3,12 @@ package org.koitharu.kotatsu.parsers.model import okhttp3.HttpUrl.Companion.toHttpUrl class Favicon internal constructor( - val url: String, - val size: Int, - internal val rel: String?, + @JvmField val url: String, + @JvmField val size: Int, + @JvmField internal val rel: String?, ) : Comparable { + @JvmField val type: String = url.toHttpUrl().pathSegments.last() .substringAfterLast('.', "").lowercase() @@ -48,4 +49,4 @@ class Favicon internal constructor( "mask-icon" -> -1 else -> 0 } -} \ No newline at end of file +} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/model/Favicons.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/model/Favicons.kt index f9c9aab7..6c37fe4f 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/model/Favicons.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/model/Favicons.kt @@ -2,7 +2,7 @@ package org.koitharu.kotatsu.parsers.model class Favicons internal constructor( favicons: Collection, - val referer: String, + @JvmField val referer: String, ) : Collection { private val icons = favicons.sortedDescending() @@ -42,4 +42,4 @@ class Favicons internal constructor( } return result } -} \ No newline at end of file +} diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/model/Manga.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/model/Manga.kt index 0f45a992..afda6dc8 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/model/Manga.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/model/Manga.kt @@ -6,67 +6,67 @@ class Manga( /** * Unique identifier for manga */ - val id: Long, + @JvmField val id: Long, /** * Manga title, human-readable */ - val title: String, + @JvmField val title: String, /** * Alternative title (for example on other language), may be null */ - val altTitle: String?, + @JvmField val altTitle: String?, /** * Relative url to manga (**without** a domain) or any other uri. * Used principally in parsers */ - val url: String, + @JvmField val url: String, /** * Absolute url to manga, must be ready to open in browser */ - val publicUrl: String, + @JvmField val publicUrl: String, /** * Normalized manga rating, must be in range of 0..1 or [RATING_UNKNOWN] if rating s unknown * @see hasRating */ - val rating: Float, + @JvmField val rating: Float, /** * Indicates that manga may contain sensitive information (18+, NSFW) */ - val isNsfw: Boolean, + @JvmField val isNsfw: Boolean, /** * Absolute link to the cover * @see largeCoverUrl */ - val coverUrl: String, + @JvmField val coverUrl: String, /** * Tags (genres) of the manga */ - val tags: Set, + @JvmField val tags: Set, /** * Manga status (ongoing, finished) or null if unknown */ - val state: MangaState?, + @JvmField val state: MangaState?, /** * Author of the manga, may be null */ - val author: String?, + @JvmField val author: String?, /** * Large cover url (absolute), null if is no large cover * @see coverUrl */ - val largeCoverUrl: String? = null, + @JvmField val largeCoverUrl: String? = null, /** * Manga description, may be html or null */ - val description: String? = null, + @JvmField val description: String? = null, /** * List of chapters */ - val chapters: List? = null, + @JvmField val chapters: List? = null, /** * Manga source */ - val source: MangaSource, + @JvmField val source: MangaSource, ) { /** diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/model/MangaChapter.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/model/MangaChapter.kt index 4059be66..21e6c6e6 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/model/MangaChapter.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/model/MangaChapter.kt @@ -4,34 +4,34 @@ class MangaChapter( /** * An unique id of chapter */ - val id: Long, + @JvmField val id: Long, /** * User-readable name of chapter */ - val name: String, + @JvmField val name: String, /** * Chapter number starting from 1 */ - val number: Int, + @JvmField val number: Int, /** * Relative url to chapter (**without** a domain) or any other uri. * Used principally in parsers */ - val url: String, + @JvmField val url: String, /** * User-readable name of scanlator (releaser) or null if unknown */ - val scanlator: String?, + @JvmField val scanlator: String?, /** * Chapter upload date in milliseconds */ - val uploadDate: Long, + @JvmField val uploadDate: Long, /** * User-readable name of branch. * A branch is a group of chapters that overlap (e.g. different languages) */ - val branch: String?, - val source: MangaSource, + @JvmField val branch: String?, + @JvmField val source: MangaSource, ) : Comparable { override fun compareTo(other: MangaChapter): Int { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/model/MangaPage.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/model/MangaPage.kt index b741fac3..2c463761 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/model/MangaPage.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/model/MangaPage.kt @@ -6,19 +6,19 @@ class MangaPage( /** * Unique identifier for manga */ - val id: Long, + @JvmField val id: Long, /** * Relative url to page (**without** a domain) or any other uri. * Used principally in parsers. * May contain link to image or html page. * @see MangaParser.getPageUrl */ - val url: String, + @JvmField val url: String, /** * Absolute url of the small page image if exists, null otherwise */ - val preview: String?, - val source: MangaSource, + @JvmField val preview: String?, + @JvmField val source: MangaSource, ) { override fun equals(other: Any?): Boolean { diff --git a/src/main/kotlin/org/koitharu/kotatsu/parsers/model/MangaTag.kt b/src/main/kotlin/org/koitharu/kotatsu/parsers/model/MangaTag.kt index be0f9083..184a850e 100644 --- a/src/main/kotlin/org/koitharu/kotatsu/parsers/model/MangaTag.kt +++ b/src/main/kotlin/org/koitharu/kotatsu/parsers/model/MangaTag.kt @@ -6,13 +6,13 @@ class MangaTag( /** * User-readable tag title, should be in Title case */ - val title: String, + @JvmField val title: String, /** * Identifier of a tag, must be unique among the source. * @see MangaParser.getList */ - val key: String, - val source: MangaSource, + @JvmField val key: String, + @JvmField val source: MangaSource, ) { override fun equals(other: Any?): Boolean {