-
Notifications
You must be signed in to change notification settings - Fork 834
Feat: TheIntroDBSkip + Bugfix #2631
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.
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
Merged
+80
−2
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 76 additions & 0 deletions
76
app/src/main/java/com/lagradost/cloudstream3/utils/videoskip/TheIntroDBSkip.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| package com.lagradost.cloudstream3.utils.videoskip | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonProperty | ||
| import com.lagradost.cloudstream3.LoadResponse | ||
| import com.lagradost.cloudstream3.LoadResponse.Companion.getImdbId | ||
| import com.lagradost.cloudstream3.LoadResponse.Companion.getTMDbId | ||
| import com.lagradost.cloudstream3.LoadResponse.Companion.isMovie | ||
| import com.lagradost.cloudstream3.TvType | ||
| import com.lagradost.cloudstream3.ui.result.ResultEpisode | ||
| import com.lagradost.cloudstream3.app | ||
|
|
||
| /** https://theintrodb.org/docs */ | ||
| class TheIntroDBSkip : SkipAPI() { | ||
| override val name = "TheIntroDB" | ||
| override val supportedTypes = setOf( | ||
| TvType.TvSeries, TvType.Cartoon, TvType.Anime, TvType.Movie, | ||
| TvType.AsianDrama | ||
| ) | ||
|
|
||
| val mainUrl = "https://api.theintrodb.org" | ||
|
|
||
| override suspend fun stamps( | ||
| data: LoadResponse, | ||
| episode: ResultEpisode, | ||
| episodeDurationMs: Long | ||
| ): List<SkipStamp>? { | ||
| val idSuffix = | ||
| data.getTMDbId()?.let { tmdbId -> "tmdb_id=$tmdbId" } | ||
| ?: data.getImdbId()?.let { imdbId -> "imdb_id=$imdbId" } | ||
| ?: return null | ||
|
|
||
| val url = if (data.isMovie()) { | ||
| "$mainUrl/v2/media?$idSuffix" | ||
| } else { | ||
| val season = episode.season ?: return null | ||
| "$mainUrl/v2/media?$idSuffix&season=$season&episode=${episode.episode}" | ||
| } | ||
| val root = app.get(url).parsed<Root>() | ||
This comment was marked as resolved.
Sorry, something went wrong.
This comment was marked as resolved.
Sorry, something went wrong. |
||
| return arrayOf( | ||
| root.intro to SkipType.Intro, | ||
| root.credits to SkipType.Credits, | ||
| root.recap to SkipType.Recap, | ||
| root.preview to SkipType.Preview | ||
| ).map { (list, type) -> | ||
| list.map { stamp -> | ||
| SkipStamp( | ||
| type, | ||
| stamp.startMs ?: 0L, | ||
| stamp.endMs ?: episodeDurationMs | ||
| ) | ||
| } | ||
| }.flatten() | ||
| } | ||
|
|
||
| data class Root( | ||
| @JsonProperty("tmdb_id") | ||
| val tmdbId: Long, | ||
| @JsonProperty("type") | ||
| val type: String, | ||
| @JsonProperty("intro") | ||
| val intro: List<Stamp> = emptyList(), | ||
| @JsonProperty("recap") | ||
| val recap: List<Stamp> = emptyList(), | ||
| @JsonProperty("credits") | ||
| val credits: List<Stamp> = emptyList(), | ||
| @JsonProperty("preview") | ||
| val preview: List<Stamp> = emptyList(), | ||
| ) | ||
|
|
||
| data class Stamp( | ||
| @JsonProperty("start_ms") | ||
| val startMs: Long?, | ||
| @JsonProperty("end_ms") | ||
| val endMs: Long?, | ||
| ) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm. Probably not for this PR in particular, but something I noticed is IntroDB is more particular about what it has, TIDB has more an often more accurate, but some things have start timestamps on TIDB but not IntroDB while having end timestamps on IntroDB but not TIDB. I wander if there is a way to mix what API it can get for different SkipStamp types...
Otherwise perhaps IntroDB should be tried first here since its smaller what it does have may in fact be better than TIDB at times...?