Merge branch 'master' of github.com:jmir1/aniyomi-extensions

src/id/kuramanime/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="eu.kanade.tachiyomi.animeextension" />

src/id/kuramanime/build.gradle

@@ -0,0 +1,12 @@
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+ext {
+    extName = 'Kuramanime'
+    pkgNameSuffix = 'id.kuramanime'
+    extClass = '.Kuramanime'
+    extVersionCode = 1
+    libVersion = '12'
+}
+
+apply from: "$rootDir/common.gradle"

src/id/kuramanime/src/eu/kanade/tachiyomi/animeextension/id/kuramanime/Kuramanime.kt

@@ -0,0 +1,174 @@
+package eu.kanade.tachiyomi.animeextension.id.kuramanime
+
+import android.app.Application
+import android.content.SharedPreferences
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
+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.Jsoup
+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
+import java.util.Locale
+
+class Kuramanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
+    override val name = "Kuramanime"
+
+    override val baseUrl = "https://kuramanime.com"
+
+    override val lang = "id"
+
+    override val supportsLatest = true
+
+    override val client: OkHttpClient = network.cloudflareClient
+
+    private val preferences: SharedPreferences by lazy {
+        Injekt.get<Application>().getSharedPreferences("source_$id", 0x0000)
+    }
+
+    override fun animeDetailsParse(document: Document): SAnime {
+        val anime = SAnime.create()
+        val status = parseStatus(document.select("div.anime__details__widget > div > div:nth-child(1) > ul > li:nth-child(3)").text().replace("Status: ", ""))
+        anime.title = document.select("div.anime__details__title > h3").text().replace("Judul: ", "")
+        anime.genre = document.select("div.anime__details__widget > div > div:nth-child(2) > ul > li:nth-child(1)").text().replace("Genre: ", "")
+        anime.status = status
+        anime.artist = document.select("div.anime__details__widget > div > div:nth-child(2) > ul > li:nth-child(5)").text()
+        anime.author = "UNKNOWN"
+        return anime
+    }
+
+    private fun parseStatus(statusString: String): Int {
+        return when (statusString) {
+            "Sedang Tayang" -> SAnime.ONGOING
+            "Selesai Tayang" -> SAnime.COMPLETED
+            else -> SAnime.UNKNOWN
+        }
+    }
+
+    override fun episodeFromElement(element: Element): SEpisode {
+        val episode = SEpisode.create()
+        val epsNum = getNumberFromEpsString(element.text())
+        episode.setUrlWithoutDomain(element.attr("href"))
+        episode.episode_number = when {
+            (epsNum.isNotEmpty()) -> epsNum.toFloat()
+            else -> 1F
+        }
+        episode.name = element.text()
+        episode.date_upload = System.currentTimeMillis()
+
+        return episode
+    }
+
+    private fun getNumberFromEpsString(epsStr: String): String {
+        return epsStr.filter { it.isDigit() }
+    }
+
+    override fun episodeListSelector(): String = "#episodeLists"
+    
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val document = response.asJsoup()
+        
+        val html = document.select(episodeListSelector()).attr("data-content")
+        val jsoupE = Jsoup.parse(html)
+
+        return jsoupE.select("a").filter { ele -> !ele.attr("href").contains("batch") }.map { episodeFromElement(it) }
+    }
+
+    private fun parseShortInfo(element : Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(element.select("a").first().attr("href"))
+        anime.thumbnail_url = element.select("a > div").first().attr("data-setbg")
+        anime.title = element.select("div.product__item__text > h5").text()
+        return anime     
+    }
+
+    override fun latestUpdatesFromElement(element: Element): SAnime = parseShortInfo(element)
+
+    override fun latestUpdatesNextPageSelector(): String = "div.product__pagination > a:last-child"
+
+    override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/anime?order_by=updated&page=$page")
+
+    override fun latestUpdatesSelector(): String = "div.product__item"
+
+    override fun popularAnimeFromElement(element: Element): SAnime = parseShortInfo(element)
+
+    override fun popularAnimeNextPageSelector(): String = "div.product__pagination > a:last-child"
+
+    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/anime")
+
+    override fun popularAnimeSelector(): String = "div.product__item"
+
+    override fun searchAnimeFromElement(element: Element): SAnime = parseShortInfo(element)
+
+    override fun searchAnimeNextPageSelector(): String = "div.product__pagination > a:last-child"
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request = GET("$baseUrl/anime?search=$query&page=$page")
+
+    override fun searchAnimeSelector(): String = "div.product__item"
+
+    override fun videoListSelector() = "#player > source"
+    override fun List<Video>.sort(): List<Video> {
+        val quality = preferences.getString("preferred_quality", null)
+        if (quality != null) {
+            val newList = mutableListOf<Video>()
+            var preferred = 0
+            for (video in this) {
+                if (video.quality.contains(quality)) {
+                    newList.add(preferred, video)
+                    preferred++
+                } else {
+                    newList.add(video)
+                }
+            }
+            return newList
+        }
+        return this
+    }
+
+    override fun videoFromElement(element: Element): Video {
+        val url = element.attr("src")
+        val quality = with(element.attr("size")) {
+            when {
+                contains("1080") -> "1080p"
+                contains("720") -> "720p"
+                contains("480") -> "480p"
+                contains("360") -> "360p"
+                else -> "Default"
+            }
+        }
+        return Video(url, quality, url, null)
+    }
+
+    override fun videoUrlParse(document: Document) = throw Exception("not used")
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) {
+        val videoQualityPref = ListPreference(screen.context).apply {
+            key = "preferred_quality"
+            title = "Preferred quality"
+            entries = arrayOf("1080p", "720p", "480p", "360p")
+            entryValues = arrayOf("1080", "720", "480", "360")
+            setDefaultValue("1080")
+            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()
+            }
+        }
+        screen.addPreference(videoQualityPref)
+    }
+}

src/ru/animevost/build.gradle

@@ -6,7 +6,7 @@ ext {
     extName = 'Animevost'
     pkgNameSuffix = 'ru.animevost'
     extClass = '.Animevost'
-    extVersionCode = 3
+    extVersionCode = 4
     libVersion = '12'
 }
 

src/ru/animevost/src/eu/kanade/tachiyomi/animeextension/ru/animevost/AnimevostSource.kt

@@ -5,6 +5,7 @@ import android.content.SharedPreferences
 import androidx.preference.ListPreference
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.animeextension.ru.animevost.dto.AnimeDetailsDto
+import eu.kanade.tachiyomi.animeextension.ru.animevost.dto.Data
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.animesource.model.AnimeFilter
 import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
@@ -29,6 +30,7 @@ import rx.Observable
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import java.lang.Exception
+import kotlin.math.roundToInt
 
 class AnimevostSource(override val name: String, override val baseUrl: String, private val baseApiUrl: String) :
     ConfigurableAnimeSource, ParsedAnimeHttpSource() {
@@ -119,7 +121,7 @@ class AnimevostSource(override val name: String, override val baseUrl: String, p
             }
 
             author = animeData.director
-            description = animeData.description
+            description = formatDescription(animeData)
 
             if (animeData.timer != null) {
                 status = if (animeData.timer > 0) SAnime.ONGOING else SAnime.COMPLETED
@@ -131,6 +133,32 @@ class AnimevostSource(override val name: String, override val baseUrl: String, p
         return anime
     }
 
+    private fun formatDescription(animeData: Data): String {
+        var description = ""
+
+        if (animeData.year != null) {
+            description += "Год: ${animeData.year}\n"
+        }
+
+        if (animeData.rating != null && animeData.votes != null) {
+            val rating = (animeData.rating.toDouble() / animeData.votes.toDouble()).roundToInt()
+
+            description += "Рейтинг: ${"★".repeat(rating)}${"☆".repeat(Math.max(5 - rating, 0))} (Голосов: ${animeData.votes})\n"
+        }
+
+        if (animeData.type != null) {
+            description += "Тип: ${animeData.type}\n"
+        }
+
+        if (description.isNotEmpty()) {
+            description += "\n"
+        }
+
+        description += animeData.description?.replace("<br />", "")
+
+        return description
+    }
+
     override fun animeDetailsParse(document: Document) = throw Exception("not used")
 
     // Episode

src/ru/animevost/src/eu/kanade/tachiyomi/animeextension/ru/animevost/dto/AnimevostDto.kt

@@ -31,4 +31,8 @@ data class Data(
     val type: String? = null,
     @SerialName("series")
     val series: String? = null,
+    @SerialName("rating")
+    val rating: Int? = null,
+    @SerialName("votes")
+    val votes: Int? = null,
 )