Skip to content

Make some classes serializable with backward compatibility #2874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Luna712 wants to merge 3 commits into
base: master
Choose a base branch
from
+51 −39
Open

Make some classes serializable with backward compatibility #2874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9de4e22
Make some classes serializable with backward compatibility
Luna712 Jun 3, 2026
f0319f1
Add SerialName for consistency
Luna712 Jun 4, 2026
7caa7e2
Add SerialName for consistency
Luna712 Jun 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 39 additions & 28 deletions library/src/commonMain/kotlin/com/lagradost/cloudstream3/MainAPI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,11 @@ import kotlinx.datetime.format.byUnicodePattern
import kotlinx.datetime.format.char
import kotlinx.datetime.format.parse
import kotlinx.datetime.toInstant
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import kotlinx.serialization.json.Json
import java.net.URI
import java.util.EnumSet
import kotlinx.serialization.json.Json
import kotlin.io.encoding.Base64
import kotlin.io.encoding.ExperimentalEncodingApi
import kotlin.math.absoluteValue
Expand Down Expand Up @@ -384,18 +386,19 @@ const val PROVIDER_STATUS_SLOW = 2
const val PROVIDER_STATUS_OK = 1
const val PROVIDER_STATUS_DOWN = 0

@Serializable
data class ProvidersInfoJson(
@JsonProperty("name") var name: String,
@JsonProperty("url") var url: String,
@JsonProperty("credentials") var credentials: String? = null,
@JsonProperty("status") var status: Int,
@SerialName("name") var name: String,
@SerialName("url") var url: String,
@SerialName("credentials") var credentials: String? = null,
@SerialName("status") var status: Int,
)

@Serializable
data class SettingsJson(
@JsonProperty("enableAdult") var enableAdult: Boolean = false,
@SerialName("enableAdult") var enableAdult: Boolean = false,
)


data class MainPageData(
val name: String,
val data: String,
Expand Down Expand Up @@ -863,10 +866,10 @@ enum class DubStatus(val id: Int) {
* of this as a decimal class specifically for ratings.
* */
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
@Serializable
class Score private constructor(
/** Decimal between [0, 10^9] representing the min score and max score respectively */
@JsonProperty("data")
private val data: Int,
@SerialName("data") private val data: Int,
) {
override fun hashCode(): Int = this.data.hashCode()
override fun equals(other: Any?): Boolean = other is Score && this.data == other.data
Expand Down Expand Up @@ -1192,9 +1195,10 @@ suspend fun newSubtitleFile(
* @see newAudioFile
* */
@ConsistentCopyVisibility
@Serializable
data class AudioFile internal constructor(
var url: String,
var headers: Map<String, String>? = null
@SerialName("url") var url: String,
@SerialName("headers") var headers: Map<String, String>? = null
)

/** Creates an AudioFile with optional initializer for setting additional properties.
Expand Down Expand Up @@ -2171,10 +2175,11 @@ data class NextAiring(
* @param name To be shown next to the season like "Season $displaySeason $name" but if displaySeason is null then "$name"
* @param displaySeason What to be displayed next to the season name, if null then the name is the only thing shown.
* */
@Serializable
data class SeasonData(
val season: Int,
val name: String? = null,
val displaySeason: Int? = null, // will use season if null
@SerialName("season") val season: Int,
@SerialName("name") val name: String? = null,
@SerialName("displaySeason") val displaySeason: Int? = null, // will use season if null
)

/** Abstract interface of EpisodeResponse */
Expand Down Expand Up @@ -2732,32 +2737,38 @@ data class Tracker(
val cover: String? = null,
)

@Serializable
data class AniSearch(
@JsonProperty("data") var data: Data? = Data()
@SerialName("data") var data: Data? = Data()
) {
@Serializable
data class Data(
@JsonProperty("Page") var page: Page? = Page()
@SerialName("Page") @JsonProperty("Page") var page: Page? = Page()
) {
@Serializable
data class Page(
@JsonProperty("media") var media: ArrayList<Media> = arrayListOf()
@SerialName("media") var media: ArrayList<Media> = arrayListOf()
) {
@Serializable
data class Media(
@JsonProperty("title") var title: Title? = null,
@JsonProperty("id") var id: Int? = null,
@JsonProperty("idMal") var idMal: Int? = null,
@JsonProperty("seasonYear") var seasonYear: Int? = null,
@JsonProperty("format") var format: String? = null,
@JsonProperty("coverImage") var coverImage: CoverImage? = null,
@JsonProperty("bannerImage") var bannerImage: String? = null,
@SerialName("title") var title: Title? = null,
@SerialName("id") var id: Int? = null,
@SerialName("idMal") var idMal: Int? = null,
@SerialName("seasonYear") var seasonYear: Int? = null,
@SerialName("format") var format: String? = null,
@SerialName("coverImage") var coverImage: CoverImage? = null,
@SerialName("bannerImage") var bannerImage: String? = null,
) {
@Serializable
data class CoverImage(
@JsonProperty("extraLarge") var extraLarge: String? = null,
@JsonProperty("large") var large: String? = null,
@SerialName("extraLarge") var extraLarge: String? = null,
@SerialName("large") var large: String? = null,
)

@Serializable
data class Title(
@JsonProperty("romaji") var romaji: String? = null,
@JsonProperty("english") var english: String? = null,
@SerialName("romaji") var romaji: String? = null,
@SerialName("english") var english: String? = null,
) {
fun isMatchingTitles(title: String?): Boolean {
if (title == null) return false
Expand Down
23 changes: 12 additions & 11 deletions library/src/commonMain/kotlin/com/lagradost/cloudstream3/utils/ExtractorApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

package com.lagradost.cloudstream3.utils

import com.fasterxml.jackson.annotation.JsonIgnore
import com.lagradost.cloudstream3.AudioFile
import com.lagradost.cloudstream3.IDownloadableMinimum
import com.lagradost.cloudstream3.Prerelease
Expand Down Expand Up @@ -315,6 +314,8 @@ import com.lagradost.cloudstream3.utils.Coroutines.atomicListOf
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.delay
import kotlinx.coroutines.ensureActive
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import org.jsoup.Jsoup
import java.net.URI
import kotlin.coroutines.cancellation.CancellationException
Expand Down Expand Up @@ -674,20 +675,21 @@ open class DrmExtractorLink private constructor(
* @property audioTracks List of separate audio tracks that can be used with this video
* @see newExtractorLink
* */
@Serializable
open class ExtractorLink
@Deprecated("Use newExtractorLink", level = DeprecationLevel.WARNING)
constructor(
open val source: String,
open val name: String,
override val url: String,
override var referer: String,
open var quality: Int,
override var headers: Map<String, String> = mapOf(),
@SerialName("source") open val source: String,
@SerialName("name") open val name: String,
@SerialName("url") override val url: String,
@SerialName("referer") override var referer: String,
@SerialName("quality") open var quality: Int,
@SerialName("headers") override var headers: Map<String, String> = mapOf(),
/** Used for getExtractorVerifierJob() */
open var extractorData: String? = null,
open var type: ExtractorLinkType,
@SerialName("extractorData") open var extractorData: String? = null,
@SerialName("type") open var type: ExtractorLinkType,
/** List of separate audio tracks that can be merged with this video */
open var audioTracks: List<AudioFile> = emptyList(),
@SerialName("audioTracks") open var audioTracks: List<AudioFile> = emptyList(),
) : IDownloadableMinimum {
val isM3u8: Boolean get() = type == ExtractorLinkType.M3U8
val isDash: Boolean get() = type == ExtractorLinkType.DASH
Expand All @@ -712,7 +714,6 @@ constructor(
return videoSize
}

@JsonIgnore
fun getAllHeaders(): Map<String, String> {
if (referer.isBlank()) {
return headers
Expand Down