diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index b8143aa9..346eb44e 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -47,12 +47,13 @@ jobs: passphrase: ${{ secrets.GPG_PASSPHRASE }} git_user_signingkey: true git_commit_gpgsign: true - + # This step is going to commit, but this will not trigger another workflow. - name: Bump extensions that uses a modified lib if: steps.modified-libs.outputs.any_changed == 'true' run: | - chmod +x ./.github/scripts/bump-versions.py ${{ steps.modified-libs.outputs.all_changed_files }} + chmod +x ./.github/scripts/bump-versions.py + ./.github/scripts/bump-versions.py ${{ steps.modified-libs.outputs.all_changed_files }} - name: Validate Gradle Wrapper uses: gradle/wrapper-validation-action@a494d935f4b56874c4a5a87d19af7afcf3a163d0 # v2 @@ -174,4 +175,3 @@ jobs: cwd: "./repo" committer_name: Kohi-den-Bot committer_email: 177773202+Kohi-den-Bot@users.noreply.github.com - diff --git a/lib-multisrc/zorotheme/build.gradle.kts b/lib-multisrc/zorotheme/build.gradle.kts index d4500e75..c963594a 100644 --- a/lib-multisrc/zorotheme/build.gradle.kts +++ b/lib-multisrc/zorotheme/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("lib-multisrc") } -baseVersionCode = 3 +baseVersionCode = 4 dependencies { api(project(":lib:megacloud-extractor")) diff --git a/lib-multisrc/zorotheme/src/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroTheme.kt b/lib-multisrc/zorotheme/src/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroTheme.kt index 4d66cf11..ebebd6c7 100644 --- a/lib-multisrc/zorotheme/src/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroTheme.kt +++ b/lib-multisrc/zorotheme/src/eu/kanade/tachiyomi/multisrc/zorotheme/ZoroTheme.kt @@ -48,7 +48,7 @@ abstract class ZoroTheme( .clearOldHosts() } - private val docHeaders = headers.newBuilder().apply { + protected val docHeaders = headers.newBuilder().apply { add("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8") add("Host", baseUrl.toHttpUrl().host) add("Referer", "$baseUrl/") @@ -217,7 +217,7 @@ abstract class ZoroTheme( val serversDoc = response.parseAs().getHtml() - val embedLinks = listOf("servers-sub", "servers-dub", "servers-mixed").map { type -> + val embedLinks = listOf("servers-sub", "servers-dub", "servers-mixed", "servers-raw").map { type -> if (type !in typeSelection) return@map emptyList() serversDoc.select("div.$type div.item").parallelMapNotNull { @@ -236,6 +236,7 @@ abstract class ZoroTheme( }.flatten() return embedLinks.parallelCatchingFlatMap(::extractVideo) + .sort() } abstract fun extractVideo(server: VideoData): List