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

feat(en/uhdmovies): update domain and add domain entry pref (#1690)

Browse Source
This commit is contained in:
Samfun75
2023-06-08 21:32:54 +03:00
committed by GitHub
parent 5226af6f34
commit a9dadb2c92
2 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ ext {
extName = 'UHD Movies'
pkgNameSuffix = 'en.uhdmovies'
extClass = '.UHDMovies'
extVersionCode = 15
extVersionCode = 16
libVersion = '13'
}

59
src/en/uhdmovies/src/eu/kanade/tachiyomi/animeextension/en/uhdmovies/UHDMovies.kt
View File

@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.animeextension.en.uhdmovies
import android.app.Application
import android.content.SharedPreferences
import android.util.Base64
import androidx.preference.EditTextPreference
import androidx.preference.ListPreference
import androidx.preference.PreferenceScreen
import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
@ -18,7 +19,6 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext
import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.Serializable
import kotlinx.serialization.encodeToString
@ -41,7 +41,7 @@ class UHDMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
override val name = "UHD Movies"
override val baseUrl by lazy { preferences.getString("pref_domain", "https://uhdmovies.bio")!! }
override val baseUrl by lazy { preferences.getString(PREF_DOMAIN_KEY, PREF_DEFAULT_DOMAIN)!! }
override val lang = "en"
@ -55,29 +55,9 @@ class UHDMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
}
private val currentBaseUrl by lazy {
runBlocking {
withContext(Dispatchers.Default) {
client.newBuilder()
.followRedirects(false)
.build()
.newCall(GET("$baseUrl/")).execute().let { resp ->
when (resp.code) {
301 -> {
(resp.headers["location"]?.substringBeforeLast("/") ?: baseUrl).also {
preferences.edit().putString("pref_domain", it).apply()
}
}
else -> baseUrl
}
}
}
}
}
// ============================== Popular ===============================
override fun popularAnimeRequest(page: Int): Request = GET("$currentBaseUrl/page/$page/")
override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/page/$page/")
override fun popularAnimeSelector(): String = "div#content div.gridlove-posts > div.layout-masonry"
@ -107,7 +87,7 @@ class UHDMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
val cleanQuery = query.replace(" ", "+").lowercase()
return GET("$currentBaseUrl/page/$page/?s=$cleanQuery")
return GET("$baseUrl/page/$page/?s=$cleanQuery")
}
override fun searchAnimeSelector(): String = popularAnimeSelector()
@ -131,7 +111,7 @@ class UHDMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
// ============================== Episodes ==============================
override fun fetchEpisodeList(anime: SAnime): Observable<List<SEpisode>> {
val resp = client.newCall(GET(currentBaseUrl + anime.url)).execute().asJsoup()
val resp = client.newCall(GET(baseUrl + anime.url)).execute().asJsoup()
val episodeList = mutableListOf<SEpisode>()
val episodeElements = resp.select("p:has(a[href*=?id=],a[href*=r?key=]):has(a[class*=maxbutton])[style*=center]")
val qualityRegex = "\\d{3,4}p".toRegex(RegexOption.IGNORE_CASE)
@ -481,7 +461,9 @@ class UHDMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
entries = arrayOf("Ascending", "Descending")
entryValues = arrayOf("asc", "dec")
setDefaultValue("asc")
summary = "%s - Sort order to be used after the videos are sorted by their quality."
summary = """%s
|Sort order to be used after the videos are sorted by their quality.
""".trimMargin()
setOnPreferenceChangeListener { _, newValue ->
val selected = newValue as String
@ -490,9 +472,29 @@ class UHDMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
preferences.edit().putString(key, entry).commit()
}
}
val domainPref = EditTextPreference(screen.context).apply {
key = PREF_DOMAIN_KEY
title = "Currently used domain"
dialogTitle = title
setDefaultValue(PREF_DEFAULT_DOMAIN)
val tempText = preferences.getString(key, PREF_DEFAULT_DOMAIN)
summary = """$tempText
|For any change to be applied App restart is required.
""".trimMargin()
setOnPreferenceChangeListener { _, newValue ->
val newValueString = newValue as String
preferences.edit().putString(key, newValueString.trim()).commit().also {
summary = """$newValueString
|For any change to be applied App restart is required.
""".trimMargin()
}
}
}
screen.addPreference(videoQualityPref)
screen.addPreference(sizeSortPref)
screen.addPreference(domainPref)
}
@Serializable
@ -515,4 +517,9 @@ class UHDMovies : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
runBlocking {
map { async(Dispatchers.Default) { f(it) } }.awaitAll()
}
companion object {
const val PREF_DOMAIN_KEY = "pref_domain_new"
const val PREF_DEFAULT_DOMAIN = "https://uhdmovies.site"
}
}