add new source haho.moe & minor tenshi cleanup

src/en/hahomoe/AndroidManifest.xml

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

src/en/hahomoe/build.gradle

@@ -0,0 +1,13 @@
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+ext {
+    extName = 'haho.moe'
+    pkgNameSuffix = 'en.hahomoe'
+    extClass = '.HahoMoe'
+    extVersionCode = 1
+    libVersion = '12'
+    containsNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"

src/en/hahomoe/src/eu/kanade/tachiyomi/animeextension/en/hahomoe/HahoMoe.kt

@@ -0,0 +1,167 @@
+package eu.kanade.tachiyomi.animeextension.en.hahomoe
+
+import android.annotation.SuppressLint
+import android.util.Log
+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.Headers.Companion.toHeaders
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import java.lang.Exception
+import java.lang.Float.parseFloat
+import java.text.SimpleDateFormat
+import java.util.Date
+import kotlin.collections.ArrayList
+
+class HahoMoe : ParsedAnimeHttpSource() {
+
+    override val name = "haho.moe"
+
+    override val baseUrl = "https://haho.moe"
+
+    override val lang = "en"
+
+    override val supportsLatest = true
+
+    override val client: OkHttpClient = network.cloudflareClient
+
+    override fun popularAnimeSelector(): String = "ul.anime-loop.loop li a"
+
+    override fun popularAnimeRequest(page: Int): Request = GET("$baseUrl/anime?s=vdy-d&page=$page")
+
+    override fun popularAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(element.attr("href") + "?s=srt-d")
+        anime.title = element.select("div span").not(".badge").text()
+        return anime
+    }
+
+    override fun popularAnimeNextPageSelector(): String = "ul.pagination li.page-item a[rel=next]"
+
+    override fun episodeListSelector() = "ul.episode-loop li a"
+
+    private fun episodeNextPageSelector() = popularAnimeNextPageSelector()
+
+    override fun episodeListParse(response: Response): List<SEpisode> {
+        val episodes = mutableListOf<SEpisode>()
+        fun addEpisodes(document: Document) {
+            document.select(episodeListSelector()).map { episodes.add(episodeFromElement(it)) }
+            document.select(episodeNextPageSelector()).firstOrNull()
+                ?.let { addEpisodes(client.newCall(GET(it.attr("href"), headers)).execute().asJsoup()) }
+        }
+
+        addEpisodes(response.asJsoup())
+        return episodes
+    }
+
+    override fun episodeFromElement(element: Element): SEpisode {
+        val episode = SEpisode.create()
+        episode.setUrlWithoutDomain(element.attr("href"))
+        val episodeNumberString = element.select("div.episode-number").text().removePrefix("Episode ")
+        var numeric = true
+        try {
+            parseFloat(episodeNumberString)
+        } catch (e: NumberFormatException) {
+            numeric = false
+        }
+        episode.episode_number = if (numeric) episodeNumberString.toFloat() else element.parent().className().removePrefix("episode").toFloat()
+        episode.name = element.select("div.episode-number").text() + ": " + element.select("div.episode-label").text() + element.select("div.episode-title").text()
+        val date: String = element.select("div.date").text()
+        val parsedDate = parseDate(date)
+        if (parsedDate.time != -1L) episode.date_upload = parsedDate.time
+        return episode
+    }
+
+    @SuppressLint("SimpleDateFormat")
+    private fun parseDate(date: String): Date {
+        val knownPatterns: MutableList<SimpleDateFormat> = ArrayList()
+        knownPatterns.add(SimpleDateFormat("dd'th of 'MMM, yyyy"))
+        knownPatterns.add(SimpleDateFormat("dd'nd of 'MMM, yyyy"))
+        knownPatterns.add(SimpleDateFormat("dd'st of 'MMM, yyyy"))
+        knownPatterns.add(SimpleDateFormat("dd'rd of 'MMM, yyyy"))
+
+        for (pattern in knownPatterns) {
+            try {
+                // Take a try
+                return Date(pattern.parse(date)!!.time)
+            } catch (e: Throwable) {
+                // Loop on
+            }
+        }
+        return Date(-1L)
+    }
+
+    override fun videoListParse(response: Response): List<Video> {
+        val document = response.asJsoup()
+        val iframe = document.selectFirst("iframe").attr("src")
+        val referer = response.request.url.encodedPath
+        val newHeaderList = mutableMapOf(Pair("referer", baseUrl + referer))
+        headers.forEach { newHeaderList[it.first] = it.second }
+        val iframeResponse = client.newCall(GET(iframe, newHeaderList.toHeaders()))
+            .execute().asJsoup()
+        return iframeResponse.select(videoListSelector()).map { videoFromElement(it) }
+    }
+
+    override fun videoListSelector() = "source"
+
+    override fun videoFromElement(element: Element): Video {
+        Log.i("lol", element.attr("src"))
+        return Video(element.attr("src"), element.attr("title"), element.attr("src"), null)
+    }
+
+    override fun videoUrlParse(document: Document) = throw Exception("not used")
+
+    override fun searchAnimeFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(element.attr("href") + "?s=srt-d")
+        anime.title = element.select("div span.thumb-title, div span.text-primary").text()
+        return anime
+    }
+
+    override fun searchAnimeNextPageSelector(): String = "ul.pagination li.page-item a[rel=next]"
+
+    override fun searchAnimeSelector(): String = "ul.anime-loop.loop li a"
+
+    override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request = GET("$baseUrl/anime?q=$query")
+
+    override fun animeDetailsParse(document: Document): SAnime {
+        val anime = SAnime.create()
+        anime.thumbnail_url = document.select("img.cover-image.img-thumbnail").first().attr("src")
+        anime.title = document.select("li.breadcrumb-item.active").text()
+        anime.genre = document.select("li.genre span.value").joinToString(", ") { it.text() }
+        anime.description = document.select("div.card-body").text()
+        anime.author = document.select("li.production span.value").joinToString(", ") { it.text() }
+        anime.artist = document.select("li.group span.value").text()
+        anime.status = parseStatus(document.select("li.status span.value").text())
+        return anime
+    }
+
+    private fun parseStatus(statusString: String): Int {
+        return when (statusString) {
+            "Ongoing" -> SAnime.ONGOING
+            "Completed" -> SAnime.COMPLETED
+            else -> SAnime.UNKNOWN
+        }
+    }
+
+    override fun latestUpdatesNextPageSelector(): String = "ul.pagination li.page-item a[rel=next]"
+
+    override fun latestUpdatesFromElement(element: Element): SAnime {
+        val anime = SAnime.create()
+        anime.setUrlWithoutDomain(element.attr("href") + "?s=srt-d")
+        anime.title = element.select("div span").not(".badge").text()
+        return anime
+    }
+
+    override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/anime?s=rel-d&page=$page")
+
+    override fun latestUpdatesSelector(): String = "ul.anime-loop.loop li a"
+}

src/en/tenshimoe/build.gradle

@@ -5,13 +5,8 @@ ext {
     extName = 'tenshi.moe'
     pkgNameSuffix = 'en.tenshimoe'
     extClass = '.TenshiMoe'
-    extVersionCode = 19
+    extVersionCode = 20
     libVersion = '12'
 }
-dependencies {
-    ext.coroutinesVersion = "1.4.3"
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion")
-}
 
 apply from: "$rootDir/common.gradle"

src/en/tenshimoe/src/eu/kanade/tachiyomi/animeextension/en/tenshimoe/TenshiMoe.kt

@@ -8,9 +8,7 @@ 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.network.await
 import eu.kanade.tachiyomi.util.asJsoup
-import kotlinx.coroutines.runBlocking
 import okhttp3.Headers.Companion.toHeaders
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -56,7 +54,7 @@ class TenshiMoe : ParsedAnimeHttpSource() {
         val episodes = mutableListOf<SEpisode>()
         fun addEpisodes(document: Document) {
             document.select(episodeListSelector()).map { episodes.add(episodeFromElement(it)) }
-            document.select("${episodeNextPageSelector()}").firstOrNull()
+            document.select(episodeNextPageSelector()).firstOrNull()
                 ?.let { addEpisodes(client.newCall(GET(it.attr("href"), headers)).execute().asJsoup()) }
         }
 
@@ -107,10 +105,8 @@ class TenshiMoe : ParsedAnimeHttpSource() {
         val referer = response.request.url.encodedPath
         val newHeaderList = mutableMapOf(Pair("referer", baseUrl + referer))
         headers.forEach { newHeaderList[it.first] = it.second }
-        val iframeResponse = runBlocking {
+        val iframeResponse = client.newCall(GET(iframe, newHeaderList.toHeaders()))
-            client.newCall(GET(iframe, newHeaderList.toHeaders()))
+            .execute().asJsoup()
-                .await().asJsoup()
-        }
         return iframeResponse.select(videoListSelector()).map { videoFromElement(it) }
     }