From fcbf3f907f4c2f55d43eee58e3605fd46a68ff88 Mon Sep 17 00:00:00 2001 From: hexated Date: Sat, 22 Apr 2023 14:30:47 +0700 Subject: [PATCH] test build --- .github/workflows/build.yml | 5 +++++ SoraStream/build.gradle.kts | 4 +--- SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt | 4 ++-- SoraStream/src/main/kotlin/com/hexated/SoraStream.kt | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 40f04465..f68609f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,6 +40,11 @@ jobs: - name: Setup Android SDK uses: android-actions/setup-android@v2 + - name: Access SORA_API + env: + SORA_API: $ + run: echo SORA_API=\"$SORA_API\" > ./local.properties + - name: Build Plugins run: | cd $GITHUB_WORKSPACE/src diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts index 5ea177d9..34d50b7f 100644 --- a/SoraStream/build.gradle.kts +++ b/SoraStream/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.konan.properties.Properties // use an integer for version numbers -version = 123 +version = 122 android { defaultConfig { @@ -9,8 +9,6 @@ android { properties.load(project.rootProject.file("local.properties").inputStream()) buildConfigField("String", "SORA_API", "\"${properties.getProperty("SORA_API")}\"") - buildConfigField("String", "SORA_WEB", "\"${properties.getProperty("SORA_WEB")}\"") - buildConfigField("String", "CRY_API", "\"${properties.getProperty("CRY_API")}\"") } } diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt index a05a4088..e1d7db87 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt @@ -661,7 +661,7 @@ object SoraExtractor : SoraStream() { this.name, this.name, media?.mediaUrl ?: return@map null, - "${BuildConfig.SORA_WEB}/", + base64DecodeAPI("Lw==b20=LmM=b2s=a2w=bG8=Ly8=czo=dHA=aHQ="), getSoraQuality(media.currentDefinition ?: ""), true, ) @@ -2892,7 +2892,7 @@ object SoraExtractor : SoraStream() { episode: Int? = null, callback: (ExtractorLink) -> Unit ) { - app.get("${BuildConfig.CRY_API}/stream/movie/$imdbId.json") + app.get("${cryMoviesAPI}/stream/movie/$imdbId.json") .parsedSafe()?.streams?.filter { matchingIndex( it.title, diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt index e7605403..ca8c9908 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt @@ -149,6 +149,7 @@ open class SoraStream : TmdbProvider() { const val shinobiMovieAPI = "https://home.shinobicloud.cf/0:" const val vitoenMovieAPI = "https://openmatte.vitoencodes.workers.dev/0:" const val shivamhwAPI = "https://foogle.shivamhw.me" + val cryMoviesAPI = base64DecodeAPI("ZXY=LmQ=cnM=a2U=b3I=Lnc=ZXI=ZGQ=bGE=cy0=b2I=YWM=Lmo=YWw=aW4=LWY=cm4=Ym8=cmU=Ly8=czo=dHA=aHQ=") fun getType(t: String?): TvType { return when (t) {