Various cleanups

This commit is contained in:
Jace 2022-08-23 10:03:41 +08:00
parent 14e8cf2f0f
commit ca5ed299dc
9 changed files with 20 additions and 21 deletions

View file

@ -1,5 +1,5 @@
// use an integer for version numbers // use an integer for version numbers
version = 2 version = 3
cloudstream { cloudstream {

View file

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest package="com.example"/> <manifest package="com.lagradost"/>

View file

@ -10,10 +10,10 @@ import com.lagradost.cloudstream3.utils.loadExtractor
import org.jsoup.Jsoup import org.jsoup.Jsoup
class JavFreeProvider : MainAPI() { class JavFreeProvider : MainAPI() {
private val tvType = TvType.NSFW private val globalTvType = TvType.Movie
override var name = "JavFree" override var name = "JavFree"
override var mainUrl = "https://javfree.sh" override var mainUrl = "https://javfree.sh"
override val supportedTypes: Set<TvType> get() = setOf(tvType) override val supportedTypes: Set<TvType> get() = setOf(TvType.NSFW)
override val hasDownloadSupport: Boolean get() = false override val hasDownloadSupport: Boolean get() = false
override val hasMainPage: Boolean get() = true override val hasMainPage: Boolean get() = true
override val hasQuickSearch: Boolean get() = false override val hasQuickSearch: Boolean get() = false
@ -65,7 +65,7 @@ class JavFreeProvider : MainAPI() {
name = name, name = name,
url = link, url = link,
apiName = this.name, apiName = this.name,
type = tvType, type = globalTvType,
posterUrl = image, posterUrl = image,
year = year year = year
) )
@ -103,7 +103,7 @@ class JavFreeProvider : MainAPI() {
name = title, name = title,
url = url, url = url,
apiName = this.name, apiName = this.name,
type = tvType, type = globalTvType,
posterUrl = image, posterUrl = image,
year = year year = year
) )
@ -138,7 +138,7 @@ class JavFreeProvider : MainAPI() {
name = title, name = title,
url = url, url = url,
apiName = this.name, apiName = this.name,
type = tvType, type = globalTvType,
dataUrl = streamUrl, dataUrl = streamUrl,
posterUrl = poster, posterUrl = poster,
year = year, year = year,

View file

@ -1,5 +1,5 @@
// use an integer for version numbers // use an integer for version numbers
version = 1 version = 2
cloudstream { cloudstream {

View file

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest package="com.example"/> <manifest package="com.lagradost"/>

View file

@ -18,7 +18,7 @@ class JavSubProvider : MainAPI() {
override val hasQuickSearch: Boolean get() = false override val hasQuickSearch: Boolean get() = false
private val prefixTag = "dummyTag" //For use on stream links to differentiate links private val prefixTag = "dummyTag" //For use on stream links to differentiate links
private val tvType = TvType.NSFW private val globalTvType = TvType.Movie
data class ResponseMovieDetails( data class ResponseMovieDetails(
@JsonProperty("name") val name: String?, @JsonProperty("name") val name: String?,
@ -55,7 +55,7 @@ class JavSubProvider : MainAPI() {
name = name, name = name,
url = link, url = link,
apiName = this.name, apiName = this.name,
type = tvType, type = globalTvType,
posterUrl = image, posterUrl = image,
year = year year = year
) )
@ -96,7 +96,7 @@ class JavSubProvider : MainAPI() {
name = title, name = title,
url = link, url = link,
apiName = this.name, apiName = this.name,
type = tvType, type = globalTvType,
posterUrl = image, posterUrl = image,
year = year year = year
) )
@ -158,7 +158,7 @@ class JavSubProvider : MainAPI() {
name = title, name = title,
url = url, url = url,
apiName = this.name, apiName = this.name,
type = tvType, type = globalTvType,
dataUrl = playerIframes.toJson(), dataUrl = playerIframes.toJson(),
posterUrl = poster, posterUrl = poster,
year = year, year = year,

View file

@ -1,5 +1,5 @@
// use an integer for version numbers // use an integer for version numbers
version = 1 version = 2
cloudstream { cloudstream {

View file

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest package="com.example"/> <manifest package="com.lagradost"/>

View file

@ -6,13 +6,13 @@ import com.lagradost.cloudstream3.utils.*
class XvideosProvider : MainAPI() { class XvideosProvider : MainAPI() {
private val globalTvType = TvType.NSFW private val globalTvType = TvType.Movie
override var mainUrl = "https://www.xvideos.com" override var mainUrl = "https://www.xvideos.com"
override var name = "Xvideos" override var name = "Xvideos"
override val hasMainPage = true override val hasMainPage = true
override val hasChromecastSupport = true override val hasChromecastSupport = true
override val hasDownloadSupport = true override val hasDownloadSupport = true
override val supportedTypes = setOf(globalTvType) override val supportedTypes = setOf(TvType.NSFW)
override val mainPage = mainPageOf( override val mainPage = mainPageOf(
Pair(mainUrl, "Main Page"), Pair(mainUrl, "Main Page"),
@ -81,7 +81,7 @@ class XvideosProvider : MainAPI() {
}.toList() }.toList()
} }
override suspend fun load(url: String): LoadResponse? { override suspend fun load(url: String): LoadResponse {
val soup = app.get(url).document val soup = app.get(url).document
val title = if (url.contains("channels")||url.contains("pornstars")) soup.selectFirst("html.xv-responsive.is-desktop head title")?.text() else val title = if (url.contains("channels")||url.contains("pornstars")) soup.selectFirst("html.xv-responsive.is-desktop head title")?.text() else
soup.selectFirst(".page-title")?.text() soup.selectFirst(".page-title")?.text()
@ -106,7 +106,7 @@ class XvideosProvider : MainAPI() {
name = title ?: "", name = title ?: "",
url = url, url = url,
apiName = this.name, apiName = this.name,
type = globalTvType, type = tvType,
episodes = episodes, episodes = episodes,
posterUrl = poster, posterUrl = poster,
plot = title, plot = title,
@ -114,7 +114,7 @@ class XvideosProvider : MainAPI() {
tags = tags, tags = tags,
) )
} }
TvType.NSFW -> { else -> {
MovieLoadResponse( MovieLoadResponse(
name = title ?: "", name = title ?: "",
url = url, url = url,
@ -126,7 +126,6 @@ class XvideosProvider : MainAPI() {
tags = tags, tags = tags,
) )
} }
else -> null
} }
} }
override suspend fun loadLinks( override suspend fun loadLinks(