diff --git a/src/de/aniworld/build.gradle b/src/de/aniworld/build.gradle index 79b599382..6734fb8a0 100644 --- a/src/de/aniworld/build.gradle +++ b/src/de/aniworld/build.gradle @@ -1,5 +1,5 @@ ext { - extName = 'AniWorld (experimental)' + extName = 'AniWorld' extClass = '.AniWorld' extVersionCode = 23 } diff --git a/src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/AWConstants.kt b/src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/AWConstants.kt index 6fc1fc756..e7aec8a73 100644 --- a/src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/AWConstants.kt +++ b/src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/AWConstants.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.animeextension.de.aniworld -import android.content.SharedPreferences - object AWConstants { const val NAME_DOOD = "Doodstream" const val NAME_STAPE = "Streamtape" @@ -29,14 +27,4 @@ object AWConstants { const val PREFERRED_HOSTER = "preferred_hoster" const val PREFERRED_LANG = "preferred_lang" const val HOSTER_SELECTION = "hoster_selection" - - const val LOGIN_TITLE = "E-Mail-Adresse" - const val LOGIN_DEFAULT = "" - const val PASSWORD_TITLE = "Passwort" - const val PASSWORD_DEFAULT = "" - - const val LOGIN_URL = "https://aniworld.to/login" - - fun getPrefBaseLogin(preferences: SharedPreferences): String = preferences.getString(LOGIN_TITLE, LOGIN_DEFAULT)!! - fun getPrefBasePassword(preferences: SharedPreferences): String = preferences.getString(PASSWORD_TITLE, PASSWORD_DEFAULT)!! } diff --git a/src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/AniWorld.kt b/src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/AniWorld.kt index b841e4811..7b449e1ea 100644 --- a/src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/AniWorld.kt +++ b/src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/AniWorld.kt @@ -2,10 +2,6 @@ package eu.kanade.tachiyomi.animeextension.de.aniworld import android.app.Application import android.content.SharedPreferences -import android.text.InputType -import android.util.Log -import android.widget.Toast -import androidx.preference.EditTextPreference import androidx.preference.ListPreference import androidx.preference.MultiSelectListPreference import androidx.preference.PreferenceScreen @@ -30,7 +26,6 @@ import kotlinx.serialization.json.jsonObject import kotlinx.serialization.json.jsonPrimitive import okhttp3.FormBody import okhttp3.Headers -import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.Response import org.jsoup.nodes.Document @@ -41,15 +36,14 @@ import uy.kohesive.injekt.injectLazy class AniWorld : ConfigurableAnimeSource, ParsedAnimeHttpSource() { - override val name = "AniWorld (experimental)" + override val name = "AniWorld" override val baseUrl = "https://aniworld.to" - private val baseLogin by lazy { AWConstants.getPrefBaseLogin(preferences) } - private val basePassword by lazy { AWConstants.getPrefBasePassword(preferences) } - override val lang = "de" + override val id: Long = 8286900189409315836 + override val supportsLatest = true private val preferences: SharedPreferences by lazy { @@ -60,14 +54,8 @@ class AniWorld : ConfigurableAnimeSource, ParsedAnimeHttpSource() { .addInterceptor(DdosGuardInterceptor(network.client)) .build() - private val authClient = network.client.newBuilder() - .addInterceptor(AniWorldInterceptor(client, preferences)) - .build() - private val json: Json by injectLazy() - val context = Injekt.get() - // ===== POPULAR ANIME ===== override fun popularAnimeSelector(): String = "div.seriesListContainer div" @@ -78,7 +66,6 @@ class AniWorld : ConfigurableAnimeSource, ParsedAnimeHttpSource() { } override fun popularAnimeFromElement(element: Element): SAnime { - context val anime = SAnime.create() val linkElement = element.selectFirst("a")!! anime.url = linkElement.attr("href") @@ -190,14 +177,14 @@ class AniWorld : ConfigurableAnimeSource, ParsedAnimeHttpSource() { private fun parseEpisodesFromSeries(element: Element): List { val seasonId = element.attr("abs:href") - val episodesHtml = authClient.newCall(GET(seasonId)).execute().asJsoup() + val episodesHtml = client.newCall(GET(seasonId)).execute().asJsoup() val episodeElements = episodesHtml.select("table.seasonEpisodesList tbody tr") return episodeElements.map { episodeFromElement(it) } } private fun parseMoviesFromSeries(element: Element): List { val seasonId = element.attr("abs:href") - val episodesHtml = authClient.newCall(GET(seasonId)).execute().asJsoup() + val episodesHtml = client.newCall(GET(seasonId)).execute().asJsoup() val episodeElements = episodesHtml.select("table.seasonEpisodesList tbody tr") return episodeElements.map { episodeFromElement(it) } } @@ -228,8 +215,6 @@ class AniWorld : ConfigurableAnimeSource, ParsedAnimeHttpSource() { val redirectlink = document.select("ul.row li") val videoList = mutableListOf