From e6c491fc164fa1eaf32265ba16d6d4b1354d0e30 Mon Sep 17 00:00:00 2001 From: jack Date: Tue, 12 Dec 2023 02:28:42 +0700 Subject: [PATCH] update build.yml --- .github/workflows/build.yml | 12 ++---------- SoraStream/build.gradle.kts | 6 +----- .../src/main/kotlin/com/hexated/SoraExtractor.kt | 10 +++++----- SoraStream/src/main/kotlin/com/hexated/SoraStream.kt | 4 ++-- .../src/main/kotlin/com/hexated/SoraStreamLite.kt | 4 ++-- 5 files changed, 12 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 66da7bca..b5e17d0d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,10 +43,6 @@ jobs: - name: Access Secrets env: TMDB_API: ${{ secrets.TMDB_API }} - SORA_API: ${{ secrets.SORA_API }} - SORAHE: ${{ secrets.SORAHE }} - SORAXA: ${{ secrets.SORAXA }} - SORATED: ${{ secrets.SORATED }} DUMP_API: ${{ secrets.DUMP_API }} DUMP_KEY: ${{ secrets.DUMP_KEY }} CRUNCHYROLL_BASIC_TOKEN: ${{ secrets.CRUNCHYROLL_BASIC_TOKEN }} @@ -55,17 +51,13 @@ jobs: ANICHI_SERVER: ${{ secrets.ANICHI_SERVER }} ANICHI_ENDPOINT: ${{ secrets.ANICHI_ENDPOINT }} ANICHI_APP: ${{ secrets.ANICHI_APP }} - PRIMEWIRE_KEY: ${{ secrets.PRIMEWIRE_KEY }} ZSHOW_API: ${{ secrets.ZSHOW_API }} SFMOVIES_API: ${{ secrets.SFMOVIES_API }} CINEMATV_API: ${{ secrets.CINEMATV_API }} + OMOVIES_API: ${{ secrets.OMOVIES_API }} run: | cd $GITHUB_WORKSPACE/src - echo SORA_API=$SORA_API >> local.properties echo TMDB_API=$TMDB_API >> local.properties - echo SORAHE=$SORAHE >> local.properties - echo SORAXA=$SORAXA >> local.properties - echo SORATED=$SORATED >> local.properties echo DUMP_API=$DUMP_API >> local.properties echo DUMP_KEY=$DUMP_KEY >> local.properties echo CRUNCHYROLL_BASIC_TOKEN=$CRUNCHYROLL_BASIC_TOKEN >> local.properties @@ -74,10 +66,10 @@ jobs: echo ANICHI_SERVER=$ANICHI_SERVER >> local.properties echo ANICHI_ENDPOINT=$ANICHI_ENDPOINT >> local.properties echo ANICHI_APP=$ANICHI_APP >> local.properties - echo PRIMEWIRE_KEY=$PRIMEWIRE_KEY >> local.properties echo ZSHOW_API=$ZSHOW_API >> local.properties echo SFMOVIES_API=$SFMOVIES_API >> local.properties echo CINEMATV_API=$CINEMATV_API >> local.properties + echo OMOVIES_API=$OMOVIES_API >> local.properties - name: Build Plugins run: | diff --git a/SoraStream/build.gradle.kts b/SoraStream/build.gradle.kts index e671978d..c924f475 100644 --- a/SoraStream/build.gradle.kts +++ b/SoraStream/build.gradle.kts @@ -9,16 +9,12 @@ android { properties.load(project.rootProject.file("local.properties").inputStream()) buildConfigField("String", "TMDB_API", "\"${properties.getProperty("TMDB_API")}\"") + buildConfigField("String", "OMOVIES_API", "\"${properties.getProperty("OMOVIES_API")}\"") buildConfigField("String", "CINEMATV_API", "\"${properties.getProperty("CINEMATV_API")}\"") buildConfigField("String", "SFMOVIES_API", "\"${properties.getProperty("SFMOVIES_API")}\"") buildConfigField("String", "ZSHOW_API", "\"${properties.getProperty("ZSHOW_API")}\"") - buildConfigField("String", "SORA_API", "\"${properties.getProperty("SORA_API")}\"") - buildConfigField("String", "SORAHE", "\"${properties.getProperty("SORAHE")}\"") - buildConfigField("String", "SORAXA", "\"${properties.getProperty("SORAXA")}\"") - buildConfigField("String", "SORATED", "\"${properties.getProperty("SORATED")}\"") buildConfigField("String", "DUMP_API", "\"${properties.getProperty("DUMP_API")}\"") buildConfigField("String", "DUMP_KEY", "\"${properties.getProperty("DUMP_KEY")}\"") - buildConfigField("String", "PRIMEWIRE_KEY", "\"${properties.getProperty("PRIMEWIRE_KEY")}\"") buildConfigField("String", "CRUNCHYROLL_BASIC_TOKEN", "\"${properties.getProperty("CRUNCHYROLL_BASIC_TOKEN")}\"") buildConfigField("String", "CRUNCHYROLL_REFRESH_TOKEN", "\"${properties.getProperty("CRUNCHYROLL_REFRESH_TOKEN")}\"") } diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt index f64efe08..e15cd2b6 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraExtractor.kt @@ -1930,7 +1930,7 @@ object SoraExtractor : SoraStream() { } - suspend fun invokeGomovies( + suspend fun invokeOmovies( title: String? = null, year: Int? = null, season: Int? = null, @@ -1943,10 +1943,10 @@ object SoraExtractor : SoraStream() { season, episode, callback, - "https://gomovies-online.cam", - "Gomovies", - "_smQamBQsETb", - "_sBWcqbTBMaT" + BuildConfig.OMOVIES_API, + "Omovies", + base64Decode("X3NtUWFtQlFzRVRi"), + base64Decode("X3NCV2NxYlRCTWFU") ) } diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt index 15004f0f..65ce22f8 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraStream.kt @@ -44,7 +44,7 @@ import com.hexated.SoraExtractor.invokeUhdmovies import com.hexated.SoraExtractor.invokeVegamovies import com.hexated.SoraExtractor.invokeVidsrcto import com.hexated.SoraExtractor.invokeCinemaTv -import com.hexated.SoraExtractor.invokeGomovies +import com.hexated.SoraExtractor.invokeOmovies import com.hexated.SoraExtractor.invokeWatchsomuch import com.hexated.SoraExtractor.invokeZshow import com.lagradost.cloudstream3.LoadResponse.Companion.addImdbId @@ -454,7 +454,7 @@ open class SoraStream : TmdbProvider() { ) }, { - if (!res.isAnime) invokeGomovies ( + if (!res.isAnime) invokeOmovies ( res.title, res.year, res.season, diff --git a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt index bfd571ff..94832969 100644 --- a/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt +++ b/SoraStream/src/main/kotlin/com/hexated/SoraStreamLite.kt @@ -30,7 +30,7 @@ import com.hexated.SoraExtractor.invokeShowflix import com.hexated.SoraExtractor.invokeVidSrc import com.hexated.SoraExtractor.invokeVidsrcto import com.hexated.SoraExtractor.invokeCinemaTv -import com.hexated.SoraExtractor.invokeGomovies +import com.hexated.SoraExtractor.invokeOmovies import com.hexated.SoraExtractor.invokeWatchsomuch import com.hexated.SoraExtractor.invokeZshow import com.lagradost.cloudstream3.SubtitleFile @@ -135,7 +135,7 @@ class SoraStreamLite : SoraStream() { ) }, { - if (!res.isAnime) invokeGomovies( + if (!res.isAnime) invokeOmovies( res.title, res.year, res.season,