diff --git a/src/en/hentaimama/build.gradle b/src/en/hentaimama/build.gradle index 09a71d991..5027b5554 100644 --- a/src/en/hentaimama/build.gradle +++ b/src/en/hentaimama/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'HentaiMama' pkgNameSuffix = 'en.hentaimama' extClass = '.HentaiMama' - extVersionCode = 3 + extVersionCode = 4 libVersion = '13' containsNsfw = true } diff --git a/src/en/hentaimama/res/web_hi_res_500.png b/src/en/hentaimama/res/web_hi_res_500.png new file mode 100644 index 000000000..a3de5ca08 Binary files /dev/null and b/src/en/hentaimama/res/web_hi_res_500.png differ diff --git a/src/en/hentaimama/src/eu/kanade/tachiyomi/animeextension/en/hentaimama/HentaiMama.kt b/src/en/hentaimama/src/eu/kanade/tachiyomi/animeextension/en/hentaimama/HentaiMama.kt index 6f885927b..a10327215 100644 --- a/src/en/hentaimama/src/eu/kanade/tachiyomi/animeextension/en/hentaimama/HentaiMama.kt +++ b/src/en/hentaimama/src/eu/kanade/tachiyomi/animeextension/en/hentaimama/HentaiMama.kt @@ -531,8 +531,23 @@ class HentaiMama : ConfigurableAnimeSource, ParsedAnimeHttpSource() { ) + private data class Order(val name: String, val id: String) + private class OrderList(Orders: Array) : AnimeFilter.Select("Order", Orders) + private val orderName = getOrder().map { + it.name + }.toTypedArray() + private fun getOrder() = listOf( + Order("Weekly Views", "weekly"), + Order("Monthly Views", "monthly"), + Order("Alltime Views", "alltime"), + Order("A-Z", "alphabet"), + Order("Rating", "rating"), + + ) + private fun getSearchParameters(filters: AnimeFilterList): String { var totalstring = "" + var sortBy = "" filters.forEach { filter -> when (filter) { @@ -562,15 +577,21 @@ class HentaiMama : ConfigurableAnimeSource, ParsedAnimeHttpSource() { } } } + is OrderList -> { // ---Order + sortBy = getOrder()[filter.state].id + } + else -> {} } } - return "$totalstring&submit=Submit" + + return "$totalstring&submit=Submit&filter=$sortBy" } override fun getFilterList(): AnimeFilterList = AnimeFilterList( AnimeFilter.Header("Ignored if using Text Search"), AnimeFilter.Separator(), + OrderList(orderName), GenreList(getGenres()), YearList(getYears()), ProducerList(getProducer()), diff --git a/src/en/rule34video/AndroidManifest.xml b/src/en/rule34video/AndroidManifest.xml new file mode 100644 index 000000000..acb4de356 --- /dev/null +++ b/src/en/rule34video/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/en/rule34video/build.gradle b/src/en/rule34video/build.gradle new file mode 100644 index 000000000..119ecc81f --- /dev/null +++ b/src/en/rule34video/build.gradle @@ -0,0 +1,13 @@ +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' + +ext { + extName = 'Rule34Video' + pkgNameSuffix = 'en.rule34video' + extClass = '.Rule34Video' + extVersionCode = 1 + libVersion = '13' + containsNsfw = true +} + +apply from: "$rootDir/common.gradle" diff --git a/src/en/rule34video/res/mipmap-hdpi/ic_launcher.png b/src/en/rule34video/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..e71d704ff Binary files /dev/null and b/src/en/rule34video/res/mipmap-hdpi/ic_launcher.png differ diff --git a/src/en/rule34video/res/mipmap-mdpi/ic_launcher.png b/src/en/rule34video/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..2797bc7ee Binary files /dev/null and b/src/en/rule34video/res/mipmap-mdpi/ic_launcher.png differ diff --git a/src/en/rule34video/res/mipmap-xhdpi/ic_launcher.png b/src/en/rule34video/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..fbdeb0235 Binary files /dev/null and b/src/en/rule34video/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/src/en/rule34video/res/mipmap-xxhdpi/ic_launcher.png b/src/en/rule34video/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..7696e42fb Binary files /dev/null and b/src/en/rule34video/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/src/en/rule34video/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/rule34video/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..7457e0720 Binary files /dev/null and b/src/en/rule34video/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/src/en/rule34video/res/web_hi_res_500.png b/src/en/rule34video/res/web_hi_res_500.png new file mode 100644 index 000000000..7457e0720 Binary files /dev/null and b/src/en/rule34video/res/web_hi_res_500.png differ diff --git a/src/en/rule34video/src/eu/kanade/tachiyomi/animeextension/en/rule34video/Rule34Video.kt b/src/en/rule34video/src/eu/kanade/tachiyomi/animeextension/en/rule34video/Rule34Video.kt new file mode 100644 index 000000000..39a1dc4e1 --- /dev/null +++ b/src/en/rule34video/src/eu/kanade/tachiyomi/animeextension/en/rule34video/Rule34Video.kt @@ -0,0 +1,193 @@ +package eu.kanade.tachiyomi.animeextension.en.rule34video + +import android.app.Application +import android.content.SharedPreferences +import android.media.tv.TvContract +import androidx.preference.ListPreference +import androidx.preference.PreferenceScreen +import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource +import eu.kanade.tachiyomi.animesource.model.AnimeFilter +import eu.kanade.tachiyomi.animesource.model.AnimeFilterList +import eu.kanade.tachiyomi.animesource.model.SAnime +import eu.kanade.tachiyomi.animesource.model.SEpisode +import eu.kanade.tachiyomi.animesource.model.Video +import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource +import eu.kanade.tachiyomi.network.GET +import eu.kanade.tachiyomi.util.asJsoup +import okhttp3.OkHttpClient +import okhttp3.Request +import okhttp3.Response +import org.jsoup.nodes.Document +import org.jsoup.nodes.Element +import uy.kohesive.injekt.Injekt +import uy.kohesive.injekt.api.get +import java.lang.Exception + +class Rule34Video : ConfigurableAnimeSource, ParsedAnimeHttpSource() { + + override val name = "Rule34Video" + + override val baseUrl = "https://rule34video.com/" + + override val lang = "en" + + override val supportsLatest = false + + override val client: OkHttpClient = network.cloudflareClient + + private val preferences: SharedPreferences by lazy { + Injekt.get().getSharedPreferences("source_$id", 0x0000) + } + + // Popular Videos + + override fun popularAnimeSelector(): String = "div.item.thumb" + + override fun popularAnimeRequest(page: Int): Request = + GET("$baseUrl/latest-updates/$page/") + + override fun popularAnimeFromElement(element: Element): SAnime { + val anime = SAnime.create() + anime.setUrlWithoutDomain(element.select("a.th").attr("href")) + anime.title = element.select("a.th div.thumb_title").text() + anime.thumbnail_url = element.select("a.th div.img img").attr("data-original") + return anime + } + + override fun popularAnimeNextPageSelector(): String = "div.item.pager.next a" + + override fun episodeListParse(response: Response): List { + val episodes = mutableListOf() + + val jsoup = response.asJsoup() + + val episode = SEpisode.create().apply { + name = "Video" + date_upload = System.currentTimeMillis() + } + episode.setUrlWithoutDomain(response.request.url.toString()) + episodes.add(episode) + + return episodes + } + + override fun episodeListSelector() = throw Exception("not used") + + override fun episodeFromElement(element: Element) = throw Exception("not used") + + override fun videoListParse(response: Response): List