From 319d072a341d6240f1a1eaea91ce1c951235933c Mon Sep 17 00:00:00 2001 From: Secozzi <49240133+Secozzi@users.noreply.github.com> Date: Wed, 1 Mar 2023 22:58:28 +0100 Subject: [PATCH] Update hashes & url (#1347) --- src/en/allanime/build.gradle | 2 +- .../animeextension/en/allanime/AllAnime.kt | 33 ++++++++++++++----- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/en/allanime/build.gradle b/src/en/allanime/build.gradle index bc566b6da..cd2c48d37 100644 --- a/src/en/allanime/build.gradle +++ b/src/en/allanime/build.gradle @@ -6,7 +6,7 @@ ext { extName = 'AllAnime' pkgNameSuffix = 'en.allanime' extClass = '.AllAnime' - extVersionCode = 10 + extVersionCode = 11 libVersion = '13' } diff --git a/src/en/allanime/src/eu/kanade/tachiyomi/animeextension/en/allanime/AllAnime.kt b/src/en/allanime/src/eu/kanade/tachiyomi/animeextension/en/allanime/AllAnime.kt index 29d82c286..80740f235 100644 --- a/src/en/allanime/src/eu/kanade/tachiyomi/animeextension/en/allanime/AllAnime.kt +++ b/src/en/allanime/src/eu/kanade/tachiyomi/animeextension/en/allanime/AllAnime.kt @@ -41,7 +41,7 @@ class AllAnime : ConfigurableAnimeSource, AnimeHttpSource() { override val name = "AllAnime" // allanime.to - override val baseUrl = "https://api.allanime.co" + override val baseUrl by lazy { preferences.getString("preferred_domain", "https://api.allanime.to")!! } override val lang = "en" @@ -51,10 +51,10 @@ class AllAnime : ConfigurableAnimeSource, AnimeHttpSource() { private val json: Json by injectLazy() - private val popularHash = "6f6fe5663e3e9ea60bdfa693f878499badab83e7f18b56acdba5f8e8662002aa" - private val searchHash = "9c7a8bc1e095a34f2972699e8105f7aaf9082c6e1ccd56eab99c2f1a971152c6" - private val _idHash = "f73a8347df0e3e794f8955a18de6e85ac25dfc6b74af8ad613edf87bb446a854" - private val episodeHash = "1f0a5d6c9ce6cd3127ee4efd304349345b0737fbf5ec33a60bbc3d18e3bb7c61" + private val popularHash = "563c9c7c7fb5218aaf5562ad5d7cabb9ece03a36b4bc94f1384ba70709bd61da" + private val searchHash = "c4305f3918591071dfecd081da12243725364f6b7dd92072df09d915e390b1b7" + private val _idHash = "259ae45c19ceff2f855215bb82d377fe7b0ab661f9abcd41538bda935e9cb299" + private val episodeHash = "919e327075ac9e249d003aa3f804a48bbdf22d7b1d107ffe659accd54283ce48" private val preferences: SharedPreferences by lazy { Injekt.get().getSharedPreferences("source_$id", 0x0000) @@ -399,9 +399,9 @@ class AllAnime : ConfigurableAnimeSource, AnimeHttpSource() { return pList.sortedWith( compareBy( - { if (prefServer == "site_default") it.second else it.first.quality.lowercase().contains(prefServer) }, - { it.first.quality.lowercase().contains(quality) }, - { it.first.quality.lowercase().contains(subOrDub) }, + { if (prefServer == "site_default") it.second else it.first.quality.contains(prefServer, true) }, + { it.first.quality.contains(quality, true) }, + { it.first.quality.contains(subOrDub, true) }, ), ).reversed().map { t -> t.first } } @@ -441,6 +441,22 @@ class AllAnime : ConfigurableAnimeSource, AnimeHttpSource() { } override fun setupPreferenceScreen(screen: PreferenceScreen) { + val domainPref = ListPreference(screen.context).apply { + key = "preferred_domain" + title = "Preferred domain (requires app restart)" + entries = arrayOf("api.allanime.to", "api.allanime.co") + entryValues = arrayOf("https://api.allanime.to", "https://api.allanime.co") + setDefaultValue("https://api.allanime.to") + 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 serverPref = ListPreference(screen.context).apply { key = "preferred_server" title = "Preferred Video Server" @@ -529,6 +545,7 @@ class AllAnime : ConfigurableAnimeSource, AnimeHttpSource() { } } + screen.addPreference(domainPref) screen.addPreference(serverPref) screen.addPreference(hostSelection) screen.addPreference(altHostSelection)