Skip to content

Move metaproviders to library #1541

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

Merged
fire-light42 merged 3 commits into from
Feb 16, 2025
Merged

Move metaproviders to library #1541

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
75bcf96
Move metaproviders to library
Luna712 Feb 5, 2025
d31a1ab
Remove gson
Luna712 Feb 7, 2025
025396f
Merge branch 'recloudstream:master' into metaproviders-library
Luna712 Feb 11, 2025
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
1 change: 0 additions & 1 deletion app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ dependencies {
implementation(libs.quickjs)
implementation(libs.fuzzywuzzy) // Library/Ext Searching with Levenshtein Distance
implementation(libs.safefile) // To Prevent the URI File Fu*kery
implementation(libs.tmdb.java) // TMDB API v3 Wrapper Made with RetroFit
coreLibraryDesugaring(libs.desugar.jdk.libs.nio) // NIO Flavor Needed for NewPipeExtractor
implementation(libs.conscrypt.android) {
version {
Expand Down
1 change: 1 addition & 0 deletions library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ kotlin {
implementation(libs.fuzzywuzzy) // Match Extractors
implementation(libs.rhino) // Run JavaScript
implementation(libs.newpipeextractor)
implementation(libs.tmdb.java) // TMDB API v3 Wrapper Made with RetroFit
}
}
}
Expand Down
9 changes: 8 additions & 1 deletion ...tream3/metaproviders/CrossTmdbProvider.kt → ...tream3/metaproviders/CrossTmdbProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
package com.lagradost.cloudstream3.metaproviders

import com.fasterxml.jackson.annotation.JsonProperty
import com.lagradost.cloudstream3.*
import com.lagradost.cloudstream3.APIHolder.apis
import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
import com.lagradost.cloudstream3.ErrorLoadingException
import com.lagradost.cloudstream3.LoadResponse
import com.lagradost.cloudstream3.MovieLoadResponse
import com.lagradost.cloudstream3.MovieSearchResponse
import com.lagradost.cloudstream3.SearchResponse
import com.lagradost.cloudstream3.SubtitleFile
import com.lagradost.cloudstream3.TvType
import com.lagradost.cloudstream3.amap
import com.lagradost.cloudstream3.mvvm.logError
import com.lagradost.cloudstream3.utils.AppUtils.toJson
import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson
Expand Down
0 ...udstream3/metaproviders/SyncRedirector.kt → ...udstream3/metaproviders/SyncRedirector.kt
View file
Open in desktop
File renamed without changes.
0 ...loudstream3/metaproviders/TmdbProvider.kt → ...loudstream3/metaproviders/TmdbProvider.kt
View file
Open in desktop
File renamed without changes.
9 changes: 4 additions & 5 deletions ...oudstream3/metaproviders/TraktProvider.kt → ...oudstream3/metaproviders/TraktProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package com.lagradost.cloudstream3.metaproviders

import android.net.Uri
import com.fasterxml.jackson.annotation.JsonAlias
import com.fasterxml.jackson.annotation.JsonProperty
import com.lagradost.cloudstream3.APIHolder
import com.lagradost.cloudstream3.APIHolder.unixTimeMS
import com.lagradost.cloudstream3.Actor
import com.lagradost.cloudstream3.ActorData
Expand Down Expand Up @@ -33,6 +31,7 @@ import com.lagradost.cloudstream3.newTvSeriesLoadResponse
import com.lagradost.cloudstream3.newTvSeriesSearchResponse
import com.lagradost.cloudstream3.utils.AppUtils.parseJson
import com.lagradost.cloudstream3.utils.AppUtils.toJson
import java.net.URI
import java.text.SimpleDateFormat
import java.util.Locale
import kotlin.math.roundToInt
Expand Down Expand Up @@ -76,7 +75,7 @@ open class TraktProvider : MainAPI() {

if (mediaType == TvType.Movie) {
return newMovieSearchResponse(
name = media.title!!,
name = media.title ?: "",
url = Data(
type = mediaType,
mediaDetails = media,
Expand All @@ -87,7 +86,7 @@ open class TraktProvider : MainAPI() {
}
} else {
return newTvSeriesSearchResponse(
name = media.title!!,
name = media.title ?: "",
url = Data(
type = mediaType,
mediaDetails = media,
Expand Down Expand Up @@ -319,7 +318,7 @@ open class TraktProvider : MainAPI() {
private fun getWidthImageUrl(path: String?, width: String): String? {
if (path == null) return null
if (!path.contains("image.tmdb.org")) return fixPath(path)
val fileName = Uri.parse(path).lastPathSegment ?: return null
val fileName = URI(path).path?.substringAfterLast('/') ?: return null
return "https://image.tmdb.org/t/p/${width}/${fileName}"
}

Expand Down