MohmedIbrahim/cloudstream
1
0
Fork 0
forked from recloudstream/cloudstream
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix again

Browse source
This commit is contained in:
C10udburst 2022-08-06 10:13:21 +02:00
parent 0353d6abdd
commit eee80becbe
3 changed files with 231 additions and 220 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/prerelease.yml vendored
View file

@ -40,9 +40,9 @@ jobs:
# echo $ENCODED_STRING | base64 -di > "${TMP_KEYSTORE_FILE_PATH}"/prerelease_keystore.keystore # echo $ENCODED_STRING | base64 -di > "${TMP_KEYSTORE_FILE_PATH}"/prerelease_keystore.keystore
- name: Run Gradle - name: Run Gradle
run: | run: |
./gradlew app:assembleDebug ./gradlew assembleDebug
./gradlew app:androidSourcesJar ./gradlew androidSourcesJar
./gradlew build || true ./gradlew makeJar
# env: # env:
# SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }} # SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
# SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }} # SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
@ -61,4 +61,4 @@ jobs:
files: | files: |
app/build/outputs/apk/debug/*.apk app/build/outputs/apk/debug/*.apk
app/build/libs/app-sources.jar app/build/libs/app-sources.jar
app/build/intermediates/compile_app_classes_jar/debug/classes.jar app/build/classes.jar

43
app/build.gradle
View file

@ -51,22 +51,22 @@ android {
} }
buildTypes { buildTypes {
release { // release {
debuggable false // debuggable false
minifyEnabled false // minifyEnabled false
shrinkResources false // shrinkResources false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' // proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} // }
prerelease { // prerelease {
applicationIdSuffix ".prerelease" // applicationIdSuffix ".prerelease"
buildConfigField("boolean", "BETA", "true") // buildConfigField("boolean", "BETA", "true")
signingConfig signingConfigs.prerelease // signingConfig signingConfigs.prerelease
versionNameSuffix '-PRE' // versionNameSuffix '-PRE'
debuggable false // debuggable false
minifyEnabled false // minifyEnabled false
shrinkResources false // shrinkResources false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' // proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} // }
debug { debug {
debuggable true debuggable true
applicationIdSuffix ".debug" applicationIdSuffix ".debug"
@ -83,6 +83,10 @@ android {
jvmTarget = '1.8' jvmTarget = '1.8'
freeCompilerArgs = ['-Xjvm-default=compatibility'] freeCompilerArgs = ['-Xjvm-default=compatibility']
} }
lintOptions {
checkReleaseBuilds false
abortOnError false
}
} }
repositories { repositories {
@ -189,3 +193,10 @@ task androidSourcesJar(type: Jar) {
getArchiveClassifier().set('sources') getArchiveClassifier().set('sources')
from android.sourceSets.main.java.srcDirs//full sources from android.sourceSets.main.java.srcDirs//full sources
} }
task makeJar(type: Copy) {
from('build/intermediates/compile_app_classes_jar/debug') // after modifying here, you can export. Jar
into('build') // output location
include('classes.jar') // the classes file of the imported rack package
dependsOn build
}

424
app/src/test/java/com/lagradost/cloudstream3/ProviderTests.kt
View file

@ -1,220 +1,220 @@
package com.lagradost.cloudstream3 package com.lagradost.cloudstream3
import com.lagradost.cloudstream3.APIHolder.allProviders // import com.lagradost.cloudstream3.APIHolder.allProviders
import com.lagradost.cloudstream3.mvvm.logError // import com.lagradost.cloudstream3.mvvm.logError
import com.lagradost.cloudstream3.utils.Qualities // import com.lagradost.cloudstream3.utils.Qualities
import com.lagradost.cloudstream3.utils.SubtitleHelper // import com.lagradost.cloudstream3.utils.SubtitleHelper
import kotlinx.coroutines.runBlocking // import kotlinx.coroutines.runBlocking
import org.junit.Assert // import org.junit.Assert
import org.junit.Test // import org.junit.Test
class ProviderTests { class ProviderTests {
private fun getAllProviders(): List<MainAPI> { // private fun getAllProviders(): List<MainAPI> {
return allProviders.filter { !it.usesWebView } // return allProviders.filter { !it.usesWebView }
}
private suspend fun loadLinks(api: MainAPI, url: String?): Boolean {
Assert.assertNotNull("Api ${api.name} has invalid url on episode", url)
if (url == null) return true
var linksLoaded = 0
try {
val success = api.loadLinks(url, false, {}) { link ->
Assert.assertTrue(
"Api ${api.name} returns link with invalid Quality",
Qualities.values().map { it.value }.contains(link.quality)
)
Assert.assertTrue(
"Api ${api.name} returns link with invalid url",
link.url.length > 4
)
linksLoaded++
}
if (success) {
return linksLoaded > 0
}
Assert.assertTrue("Api ${api.name} has returns false on .loadLinks", success)
} catch (e: Exception) {
if (e.cause is NotImplementedError) {
Assert.fail("Provider has not implemented .loadLinks")
}
logError(e)
}
return true
}
private suspend fun testSingleProviderApi(api: MainAPI): Boolean {
val searchQueries = listOf("over", "iron", "guy")
var correctResponses = 0
var searchResult: List<SearchResponse>? = null
for (query in searchQueries) {
val response = try {
api.search(query)
} catch (e: Exception) {
if (e.cause is NotImplementedError) {
Assert.fail("Provider has not implemented .search")
}
logError(e)
null
}
if (!response.isNullOrEmpty()) {
correctResponses++
if (searchResult == null) {
searchResult = response
}
}
}
if (correctResponses == 0 || searchResult == null) {
System.err.println("Api ${api.name} did not return any valid search responses")
return false
}
try {
var validResults = false
for (result in searchResult) {
Assert.assertEquals(
"Invalid apiName on response on ${api.name}",
result.apiName,
api.name
)
val load = api.load(result.url) ?: continue
Assert.assertEquals(
"Invalid apiName on load on ${api.name}",
load.apiName,
result.apiName
)
Assert.assertTrue(
"Api ${api.name} on load does not contain any of the supportedTypes",
api.supportedTypes.contains(load.type)
)
when (load) {
is AnimeLoadResponse -> {
val gotNoEpisodes =
load.episodes.keys.isEmpty() || load.episodes.keys.any { load.episodes[it].isNullOrEmpty() }
if (gotNoEpisodes) {
println("Api ${api.name} got no episodes on ${load.url}")
continue
}
val url = (load.episodes[load.episodes.keys.first()])?.first()?.data
validResults = loadLinks(api, url)
if (!validResults) continue
}
is MovieLoadResponse -> {
val gotNoEpisodes = load.dataUrl.isBlank()
if (gotNoEpisodes) {
println("Api ${api.name} got no movie on ${load.url}")
continue
}
validResults = loadLinks(api, load.dataUrl)
if (!validResults) continue
}
is TvSeriesLoadResponse -> {
val gotNoEpisodes = load.episodes.isEmpty()
if (gotNoEpisodes) {
println("Api ${api.name} got no episodes on ${load.url}")
continue
}
validResults = loadLinks(api, load.episodes.first().data)
if (!validResults) continue
}
}
break
}
Assert.assertTrue("Api ${api.name} did not load on any}", validResults)
} catch (e: Exception) {
if (e.cause is NotImplementedError) {
Assert.fail("Provider has not implemented .load")
}
logError(e)
return false
}
return true
}
@Test
fun providersExist() {
Assert.assertTrue(getAllProviders().isNotEmpty())
}
@Test
fun providerCorrectData() {
val isoNames = SubtitleHelper.languages.map { it.ISO_639_1 }
Assert.assertFalse("ISO does not contain any languages", isoNames.isNullOrEmpty())
for (api in getAllProviders()) {
Assert.assertTrue("Api does not contain a mainUrl", api.mainUrl != "NONE")
Assert.assertTrue("Api does not contain a name", api.name != "NONE")
Assert.assertTrue(
"Api ${api.name} does not contain a valid language code",
isoNames.contains(api.lang)
)
Assert.assertTrue(
"Api ${api.name} does not contain any supported types",
api.supportedTypes.isNotEmpty()
)
}
}
@Test
fun providerCorrectHomepage() {
runBlocking {
getAllProviders().apmap { api ->
if (api.hasMainPage) {
try {
val homepage = api.getMainPage()
when {
homepage == null -> {
Assert.fail("Homepage provider ${api.name} did not correctly load homepage!")
}
homepage.items.isEmpty() -> {
Assert.fail("Homepage provider ${api.name} does not contain any items!")
}
homepage.items.any { it.list.isEmpty() } -> {
Assert.fail("Homepage provider ${api.name} does not have any items on result!")
}
}
} catch (e: Exception) {
if (e.cause is NotImplementedError) {
Assert.fail("Provider marked as hasMainPage, while in reality is has not been implemented")
}
logError(e)
}
}
}
}
}
// @Test
// fun testSingleProvider() {
// testSingleProviderApi(ThenosProvider())
// } // }
@Test // private suspend fun loadLinks(api: MainAPI, url: String?): Boolean {
suspend fun providerCorrect() { // Assert.assertNotNull("Api ${api.name} has invalid url on episode", url)
val invalidProvider = ArrayList<Pair<MainAPI, Exception?>>() // if (url == null) return true
val providers = getAllProviders() // var linksLoaded = 0
providers.apmap { api -> // try {
try { // val success = api.loadLinks(url, false, {}) { link ->
println("Trying $api") // Assert.assertTrue(
if (testSingleProviderApi(api)) { // "Api ${api.name} returns link with invalid Quality",
println("Success $api") // Qualities.values().map { it.value }.contains(link.quality)
} else { // )
System.err.println("Error $api") // Assert.assertTrue(
invalidProvider.add(Pair(api, null)) // "Api ${api.name} returns link with invalid url",
} // link.url.length > 4
} catch (e: Exception) { // )
logError(e) // linksLoaded++
invalidProvider.add(Pair(api, e)) // }
} // if (success) {
} // return linksLoaded > 0
// }
// Assert.assertTrue("Api ${api.name} has returns false on .loadLinks", success)
// } catch (e: Exception) {
// if (e.cause is NotImplementedError) {
// Assert.fail("Provider has not implemented .loadLinks")
// }
// logError(e)
// }
// return true
// }
println("Invalid providers are: ") // private suspend fun testSingleProviderApi(api: MainAPI): Boolean {
for (provider in invalidProvider) { // val searchQueries = listOf("over", "iron", "guy")
println("${provider.first}") // var correctResponses = 0
} // var searchResult: List<SearchResponse>? = null
} // for (query in searchQueries) {
// val response = try {
// api.search(query)
// } catch (e: Exception) {
// if (e.cause is NotImplementedError) {
// Assert.fail("Provider has not implemented .search")
// }
// logError(e)
// null
// }
// if (!response.isNullOrEmpty()) {
// correctResponses++
// if (searchResult == null) {
// searchResult = response
// }
// }
// }
// if (correctResponses == 0 || searchResult == null) {
// System.err.println("Api ${api.name} did not return any valid search responses")
// return false
// }
// try {
// var validResults = false
// for (result in searchResult) {
// Assert.assertEquals(
// "Invalid apiName on response on ${api.name}",
// result.apiName,
// api.name
// )
// val load = api.load(result.url) ?: continue
// Assert.assertEquals(
// "Invalid apiName on load on ${api.name}",
// load.apiName,
// result.apiName
// )
// Assert.assertTrue(
// "Api ${api.name} on load does not contain any of the supportedTypes",
// api.supportedTypes.contains(load.type)
// )
// when (load) {
// is AnimeLoadResponse -> {
// val gotNoEpisodes =
// load.episodes.keys.isEmpty() || load.episodes.keys.any { load.episodes[it].isNullOrEmpty() }
// if (gotNoEpisodes) {
// println("Api ${api.name} got no episodes on ${load.url}")
// continue
// }
// val url = (load.episodes[load.episodes.keys.first()])?.first()?.data
// validResults = loadLinks(api, url)
// if (!validResults) continue
// }
// is MovieLoadResponse -> {
// val gotNoEpisodes = load.dataUrl.isBlank()
// if (gotNoEpisodes) {
// println("Api ${api.name} got no movie on ${load.url}")
// continue
// }
// validResults = loadLinks(api, load.dataUrl)
// if (!validResults) continue
// }
// is TvSeriesLoadResponse -> {
// val gotNoEpisodes = load.episodes.isEmpty()
// if (gotNoEpisodes) {
// println("Api ${api.name} got no episodes on ${load.url}")
// continue
// }
// validResults = loadLinks(api, load.episodes.first().data)
// if (!validResults) continue
// }
// }
// break
// }
// Assert.assertTrue("Api ${api.name} did not load on any}", validResults)
// } catch (e: Exception) {
// if (e.cause is NotImplementedError) {
// Assert.fail("Provider has not implemented .load")
// }
// logError(e)
// return false
// }
// return true
// }
// @Test
// fun providersExist() {
// Assert.assertTrue(getAllProviders().isNotEmpty())
// }
// @Test
// fun providerCorrectData() {
// val isoNames = SubtitleHelper.languages.map { it.ISO_639_1 }
// Assert.assertFalse("ISO does not contain any languages", isoNames.isNullOrEmpty())
// for (api in getAllProviders()) {
// Assert.assertTrue("Api does not contain a mainUrl", api.mainUrl != "NONE")
// Assert.assertTrue("Api does not contain a name", api.name != "NONE")
// Assert.assertTrue(
// "Api ${api.name} does not contain a valid language code",
// isoNames.contains(api.lang)
// )
// Assert.assertTrue(
// "Api ${api.name} does not contain any supported types",
// api.supportedTypes.isNotEmpty()
// )
// }
// }
// @Test
// fun providerCorrectHomepage() {
// runBlocking {
// getAllProviders().apmap { api ->
// if (api.hasMainPage) {
// try {
// val homepage = api.getMainPage()
// when {
// homepage == null -> {
// Assert.fail("Homepage provider ${api.name} did not correctly load homepage!")
// }
// homepage.items.isEmpty() -> {
// Assert.fail("Homepage provider ${api.name} does not contain any items!")
// }
// homepage.items.any { it.list.isEmpty() } -> {
// Assert.fail("Homepage provider ${api.name} does not have any items on result!")
// }
// }
// } catch (e: Exception) {
// if (e.cause is NotImplementedError) {
// Assert.fail("Provider marked as hasMainPage, while in reality is has not been implemented")
// }
// logError(e)
// }
// }
// }
// }
// }
// // @Test
// // fun testSingleProvider() {
// // testSingleProviderApi(ThenosProvider())
// // }
// @Test
// suspend fun providerCorrect() {
// val invalidProvider = ArrayList<Pair<MainAPI, Exception?>>()
// val providers = getAllProviders()
// providers.apmap { api ->
// try {
// println("Trying $api")
// if (testSingleProviderApi(api)) {
// println("Success $api")
// } else {
// System.err.println("Error $api")
// invalidProvider.add(Pair(api, null))
// }
// } catch (e: Exception) {
// logError(e)
// invalidProvider.add(Pair(api, e))
// }
// }
// println("Invalid providers are: ")
// for (provider in invalidProvider) {
// println("${provider.first}")
// }
// }
} }