Merge branch 'Kohi-den:main' into fix-lycoris

.github/workflows/build_push.yml

@@ -31,14 +31,15 @@ jobs:
           ref: main
           token: ${{ secrets.BOT_PAT }}
 
-      - name: Find lib changes
+      # Temporary pause because of leak of tj-actions/changed-files
-        id: modified-libs
+      # - name: Find lib changes
-        uses: tj-actions/changed-files@90a06d6ba9543371ab4df8eeca0be07ca6054959 #v42
+      #   id: modified-libs
-        with:
+      #   uses: tj-actions/changed-files@90a06d6ba9543371ab4df8eeca0be07ca6054959 #v42
-          files: lib/
+      #   with:
-          files_ignore: lib/**.md
+      #     files: lib/
-          files_separator: " "
+      #     files_ignore: lib/**.md
-          safe_output: false
+      #     files_separator: " "
+      #     safe_output: false
 
       - name: Import GPG key
         uses: crazy-max/ghaction-import-gpg@v6  # v6.1.0
@@ -48,12 +49,12 @@ jobs:
           git_user_signingkey: true
           git_commit_gpgsign: true
 
-        # This step is going to commit, but this will not trigger another workflow.
+      #   # This step is going to commit, but this will not trigger another workflow.
-      - name: Bump extensions that uses a modified lib
+      # - name: Bump extensions that uses a modified lib
-        if: steps.modified-libs.outputs.any_changed == 'true'
+      #   if: steps.modified-libs.outputs.any_changed == 'true'
-        run: |
+      #   run: |
-          chmod +x ./.github/scripts/bump-versions.py
+      #     chmod +x ./.github/scripts/bump-versions.py
-          ./.github/scripts/bump-versions.py ${{ steps.modified-libs.outputs.all_changed_files }}
+      #     ./.github/scripts/bump-versions.py ${{ steps.modified-libs.outputs.all_changed_files }}
 
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@a494d935f4b56874c4a5a87d19af7afcf3a163d0 # v2

src/it/animeworld/build.gradle

@@ -1,7 +1,7 @@
 ext {
     extName = 'ANIMEWORLD.tv'
     extClass = '.ANIMEWORLD'
-    extVersionCode = 46
+    extVersionCode = 47
 }
 
 apply from: "$rootDir/common.gradle"

src/it/animeworld/src/eu/kanade/tachiyomi/animeextension/it/animeworld/ANIMEWORLD.kt

@@ -34,7 +34,7 @@ class ANIMEWORLD : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
     // TODO: Check frequency of url changes to potentially
     // add back overridable baseurl preference
-    override val baseUrl = "https://www.animeworld.so"
+    override val baseUrl = "https://www.animeworld.ac"
 
     override val lang = "it"
 

src/pt/animesgratis/build.gradle

@@ -3,7 +3,7 @@ ext {
     extClass = '.Q1N'
     themePkg = 'dooplay'
     baseUrl = 'https://q1n.net'
-    overrideVersionCode = 17
+    overrideVersionCode = 18
 }
 
 apply from: "$rootDir/common.gradle"

src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/Q1N.kt

@@ -129,6 +129,7 @@ class Q1N : DooPlay(
             "mixdrop" in name -> mixDropExtractor.videoFromUrl(url)
             "streamtape" in name -> streamTapeExtractor.videosFromUrl(url)
             "noa" in name -> noaExtractor.videosFromUrl(url)
+            "mdplayer" in name -> noaExtractor.videosFromUrl(url, "MDPLAYER")
             "/player/" in url -> bloggerExtractor.videosFromUrl(url, headers)
             else -> emptyList()
         }

src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/extractors/NoaExtractor.kt

@@ -6,7 +6,7 @@ import okhttp3.Headers
 import okhttp3.OkHttpClient
 
 class NoaExtractor(private val client: OkHttpClient, private val headers: Headers) {
-    fun videosFromUrl(url: String): List<Video> {
+    fun videosFromUrl(url: String, name: String = "NOA"): List<Video> {
         val body = client.newCall(GET(url)).execute()
             .body.string()
 
@@ -16,7 +16,7 @@ class NoaExtractor(private val client: OkHttpClient, private val headers: Header
                     .substringAfter(":\"")
                     .substringBefore('"')
                     .replace("\\", "")
-                listOf(Video(videoUrl, "NOA", videoUrl, headers))
+                listOf(Video(videoUrl, name, videoUrl, headers))
             }
 
             "sources:" in body -> {
@@ -31,7 +31,7 @@ class NoaExtractor(private val client: OkHttpClient, private val headers: Header
                             .substringAfter(":\"")
                             .substringBefore('"')
                             .replace("\\", "")
-                        Video(videoUrl, "NOA - $label", videoUrl, headers)
+                        Video(videoUrl, "$name - $label", videoUrl, headers)
                     }
             }
 

src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/extractors/RuplayExtractor.kt

@@ -15,7 +15,7 @@ class RuplayExtractor(private val client: OkHttpClient) {
             .split(",")
             .map {
                 val videoUrl = it.substringAfter("]")
-                val quality = it.substringAfter("[").substringBefore("]")
+                val quality = it.substringAfter("[", "").substringBefore("]").ifEmpty { "Default" }
                 val headers = Headers.headersOf("Referer", videoUrl)
                 Video(videoUrl, "Ruplay - $quality", videoUrl, headers = headers)
             }