INSANEMODE/aniyomi-extensions-backup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SuperStream: Revert sub point type & Putlocker: Fix Search (#1065)

Browse Source 
Fixes https://github.com/jmir1/aniyomi-extensions/issues/1063
This commit is contained in:
Samfun75
2022-12-07 15:13:16 +03:00
committed by GitHub
parent acb6187a3e
commit ae4cfda526
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/en/putlocker/build.gradle
View File

@ -6,7 +6,7 @@ ext {
extName = 'PutLocker' extName = 'PutLocker'
pkgNameSuffix = 'en.putlocker' pkgNameSuffix = 'en.putlocker'
extClass = '.PutLocker' extClass = '.PutLocker'
extVersionCode = 2 extVersionCode = 3
libVersion = '13' libVersion = '13'
} }

2
src/en/putlocker/src/eu/kanade/tachiyomi/animeextension/en/putlocker/PutLocker.kt
View File

@ -85,7 +85,7 @@ class PutLocker : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
// =============================== Search =============================== // =============================== Search ===============================
override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request { override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
val re = Regex("[^A-Za-z0-9]") val re = Regex("[^A-Za-z0-9 ]")
val cleanQuery = re.replace(query, "").replace(" ", "+").lowercase() val cleanQuery = re.replace(query, "").replace(" ", "+").lowercase()
return GET("$baseUrl/movie/search/$cleanQuery/$page/") return GET("$baseUrl/movie/search/$cleanQuery/$page/")
} }

2
src/en/superstream/build.gradle
View File

@ -6,7 +6,7 @@ ext {
extName = 'SuperStream' extName = 'SuperStream'
pkgNameSuffix = 'en.superstream' pkgNameSuffix = 'en.superstream'
extClass = '.SuperStream' extClass = '.SuperStream'
extVersionCode = 6 extVersionCode = 7
libVersion = '13' libVersion = '13'
} }

3
src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/DataModel.kt
View File

@ -1,6 +1,7 @@
package eu.kanade.tachiyomi.animeextension.en.superstream package eu.kanade.tachiyomi.animeextension.en.superstream
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.json.JsonElement
@Serializable @Serializable
data class LinkData( data class LinkData(
@ -266,7 +267,7 @@ data class Subtitles(
val lang: String? = null, val lang: String? = null,
val language: String? = null, val language: String? = null,
val delay: Int? = null, val delay: Int? = null,
val point: String? = null, val point: JsonElement? = null,
val order: Int? = null, val order: Int? = null,
val admin_order: Int? = null, val admin_order: Int? = null,
val myselect: Int? = null, val myselect: Int? = null,

3
src/en/superstream/src/eu/kanade/tachiyomi/animeextension/en/superstream/SuperStreamAPI.kt
View File

@ -689,6 +689,7 @@ import eu.kanade.tachiyomi.network.POST
import kotlinx.serialization.decodeFromString import kotlinx.serialization.decodeFromString
import kotlinx.serialization.encodeToString import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import kotlinx.serialization.json.jsonPrimitive
import okhttp3.FormBody import okhttp3.FormBody
import okhttp3.Headers import okhttp3.Headers
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
@ -1009,7 +1010,7 @@ class SuperStreamAPI(val json: Json) {
subsList.add( subsList.add(
Track( Track(
sub.file_path, sub.file_path,
(sub.language ?: sub.lang ?: "Sub") + " ${index + 1} (${sub.point!!})" (sub.language ?: sub.lang ?: "Sub") + " ${index + 1} (${sub.point!!.jsonPrimitive.content})"
) )
) )
} }