From 246e9fbf98d5ed56b656f51f656765ae97cc76f8 Mon Sep 17 00:00:00 2001 From: enimax-anime <107899019+enimax-anime@users.noreply.github.com> Date: Tue, 4 Jul 2023 08:01:25 -0700 Subject: [PATCH] fix(en/wcofun,wcostream): Update domains and fix search (#1833) Co-authored-by: jmir1 --- src/en/wcofun/build.gradle | 2 +- .../animeextension/en/wcofun/Wcofun.kt | 18 +----------------- src/en/wcostream/build.gradle | 2 +- .../animeextension/en/wcostream/WCOStream.kt | 4 ++-- 4 files changed, 5 insertions(+), 21 deletions(-) diff --git a/src/en/wcofun/build.gradle b/src/en/wcofun/build.gradle index cc0450bc1..aea0289f8 100644 --- a/src/en/wcofun/build.gradle +++ b/src/en/wcofun/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'Wcofun' pkgNameSuffix = 'en.wcofun' extClass = '.Wcofun' - extVersionCode = 8 + extVersionCode = 9 libVersion = '13' } diff --git a/src/en/wcofun/src/eu/kanade/tachiyomi/animeextension/en/wcofun/Wcofun.kt b/src/en/wcofun/src/eu/kanade/tachiyomi/animeextension/en/wcofun/Wcofun.kt index c4efbd92a..e9d4f012a 100644 --- a/src/en/wcofun/src/eu/kanade/tachiyomi/animeextension/en/wcofun/Wcofun.kt +++ b/src/en/wcofun/src/eu/kanade/tachiyomi/animeextension/en/wcofun/Wcofun.kt @@ -36,7 +36,7 @@ class Wcofun : ConfigurableAnimeSource, ParsedAnimeHttpSource() { override val name = "Wcofun" - override val baseUrl by lazy { preferences.getString("preferred_domain", "https://www.wcofun.com")!! } + override val baseUrl = "https://www.wcofun.org" override val lang = "en" @@ -233,21 +233,6 @@ class Wcofun : ConfigurableAnimeSource, ParsedAnimeHttpSource() { override fun latestUpdatesSelector(): String = throw Exception("Not used") override fun setupPreferenceScreen(screen: PreferenceScreen) { - val domainPref = ListPreference(screen.context).apply { - key = "preferred_domain" - title = "Preferred domain (requires app restart)" - entries = arrayOf("www.wcofun.com", "www.wcofun.net", "www.wcofun.tv") - entryValues = arrayOf("https://www.wcofun.com", "https://www.wcofun.net", "https://www.wcofun.tv") - setDefaultValue("https://www.wcofun.com") - summary = "%s" - - setOnPreferenceChangeListener { _, newValue -> - val selected = newValue as String - val index = findIndexOfValue(selected) - val entry = entryValues[index] as String - preferences.edit().putString(key, entry).commit() - } - } val videoQualityPref = ListPreference(screen.context).apply { key = "preferred_quality" title = "Preferred quality" @@ -263,7 +248,6 @@ class Wcofun : ConfigurableAnimeSource, ParsedAnimeHttpSource() { preferences.edit().putString(key, entry).commit() } } - screen.addPreference(domainPref) screen.addPreference(videoQualityPref) } } diff --git a/src/en/wcostream/build.gradle b/src/en/wcostream/build.gradle index 1c2ab9154..d1f52cd77 100644 --- a/src/en/wcostream/build.gradle +++ b/src/en/wcostream/build.gradle @@ -6,7 +6,7 @@ ext { extName = 'WCOStream' pkgNameSuffix = 'en.wcostream' extClass = '.WCOStream' - extVersionCode = 4 + extVersionCode = 5 libVersion = '13' } diff --git a/src/en/wcostream/src/eu/kanade/tachiyomi/animeextension/en/wcostream/WCOStream.kt b/src/en/wcostream/src/eu/kanade/tachiyomi/animeextension/en/wcostream/WCOStream.kt index 7a6966a65..cf41e6f46 100644 --- a/src/en/wcostream/src/eu/kanade/tachiyomi/animeextension/en/wcostream/WCOStream.kt +++ b/src/en/wcostream/src/eu/kanade/tachiyomi/animeextension/en/wcostream/WCOStream.kt @@ -39,7 +39,7 @@ class WCOStream : ConfigurableAnimeSource, ParsedAnimeHttpSource() { override val name = "WCOStream" - override val baseUrl = "https://www.wcostream.net" + override val baseUrl = "https://www.wcostream.org" override val lang = "en" @@ -55,7 +55,7 @@ class WCOStream : ConfigurableAnimeSource, ParsedAnimeHttpSource() { override fun headersBuilder(): Headers.Builder { return super.headersBuilder() - .add("Referer", "https://wcostream.net/") + .add("Referer", "https://wcostream.org/") } // Popular Anime