AlmightyHak/extensions-source
2
0
Fork 1
Code Issues 296 Pull requests 6 Projects Releases Packages Wiki Activity Actions

Fix neko sama + FRAnime (#128)

Browse source 
* FrAnime Fix

* NekoSama Fix

* Update build.gradle

* Update NekoSama.kt

* Update FrAnimeDto.kt

* Update FrAnimeDto.kt
This commit is contained in:
mobby45 2024-08-09 16:03:01 +02:00 • committed by GitHub
parent ae5466af0c
commit cc963b11ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 100 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/vidmoly-extractor/build.gradle.kts Normal file
View file

@ -0,0 +1,7 @@
plugins {
id("lib-android")
}
dependencies {
implementation(project(":lib:playlist-utils"))
}

40
lib/vidmoly-extractor/src/main/java/eu/kanade/tachiyomi/lib/vidmolyextractor/VidMolyExtractor.kt Normal file
View file

@ -0,0 +1,40 @@
package eu.kanade.tachiyomi.lib.vidmolyextractor
import eu.kanade.tachiyomi.animesource.model.Video
import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.util.asJsoup
import okhttp3.Headers
import okhttp3.OkHttpClient
import okhttp3.internal.EMPTY_HEADERS
class VidMolyExtractor(private val client: OkHttpClient, headers: Headers = EMPTY_HEADERS) {
private val baseUrl = "https://vidmoly.to"
private val playlistUtils by lazy { PlaylistUtils(client) }
private val headers: Headers = headers.newBuilder()
.set("Origin", baseUrl)
.set("Referer", "$baseUrl/")
.build()
private val sourcesRegex = Regex("sources: (.*?]),")
private val urlsRegex = Regex("""file:"(.*?)"""")
fun videosFromUrl(url: String, prefix: String = ""): List<Video> {
val document = client.newCall(
GET(url, headers.newBuilder().set("Sec-Fetch-Dest", "iframe").build())
).execute().asJsoup()
val script = document.selectFirst("script:containsData(sources)")!!.data()
val sources = sourcesRegex.find(script)!!.groupValues[1]
val urls = urlsRegex.findAll(sources).map { it.groupValues[1] }.toList()
return urls.flatMap {
playlistUtils.extractFromHls(it,
videoNameGen = { quality -> "${prefix}VidMoly - $quality" },
masterHeaders = headers,
videoHeaders = headers,
)
}
}
}

18
src/fr/franime/AndroidManifest.xml
View file

@ -2,20 +2,20 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<activity
android:name=".fr.franime.FrAnimeUrlActivity"
android:excludeFromRecents="true"
android:exported="true"
android:theme="@android:style/Theme.NoDisplay"
>
android:name=".fr.franime.FrAnimeUrlActivity"
android:excludeFromRecents="true"
android:exported="true"
android:theme="@android:style/Theme.NoDisplay"
>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data
android:scheme="https"
android:host="franime.fr"
android:pathPattern="/anime/..*"
/>
android:scheme="https"
android:host="franime.fr"
android:pathPattern="/anime/..*"
/>
</intent-filter>
</activity>
</application>

1
src/fr/franime/build.gradle
View file

@ -11,4 +11,5 @@ dependencies {
implementation(project(':lib:vk-extractor'))
implementation(project(':lib:sendvid-extractor'))
implementation(project(':lib:sibnet-extractor'))
implementation project(':lib:vidmoly-extractor')
}

16
src/fr/franime/src/eu/kanade/tachiyomi/animeextension/fr/franime/FrAnime.kt
View file

@ -9,6 +9,7 @@ import eu.kanade.tachiyomi.animesource.model.Video
import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
import eu.kanade.tachiyomi.lib.sendvidextractor.SendvidExtractor
import eu.kanade.tachiyomi.lib.sibnetextractor.SibnetExtractor
import eu.kanade.tachiyomi.lib.vidmolyextractor.VidMolyExtractor
import eu.kanade.tachiyomi.lib.vkextractor.VkExtractor
import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.network.await
@ -101,7 +102,7 @@ class FrAnime : AnimeHttpSource() {
SEpisode.create().apply {
setUrlWithoutDomain(anime.url + "&ep=${index + 1}")
name = episode.title
name = episode.title ?: "Episode ${index + 1}"
episode_number = (index + 1).toFloat()
}
}
@ -123,14 +124,19 @@ class FrAnime : AnimeHttpSource() {
val players = if (episodeLang == "vo") episodeData.languages.vo.players else episodeData.languages.vf.players
val sendvidExtractor by lazy { SendvidExtractor(client, headers) }
val sibnetExtractor by lazy { SibnetExtractor(client) }
val vkExtractor by lazy { VkExtractor(client, headers) }
val vidMolyExtractor by lazy { VidMolyExtractor(client) }
val videos = players.withIndex().parallelCatchingFlatMap { (index, playerName) ->
val apiUrl = "$videoBaseUrl/$episodeLang/$index"
val playerUrl = client.newCall(GET(apiUrl, headers)).await().body.string()
when (playerName) {
"vido" -> listOf(Video(playerUrl, "FRAnime (Vido)", playerUrl))
"sendvid" -> SendvidExtractor(client, headers).videosFromUrl(playerUrl)
"sibnet" -> SibnetExtractor(client).videosFromUrl(playerUrl)
"vk" -> VkExtractor(client, headers).videosFromUrl(playerUrl)
"sendvid" -> sendvidExtractor.videosFromUrl(playerUrl)
"sibnet" -> sibnetExtractor.videosFromUrl(playerUrl)
"vk" -> vkExtractor.videosFromUrl(playerUrl)
"vidmoly" -> vidMolyExtractor.videosFromUrl(playerUrl)
else -> emptyList()
}
}

3
src/fr/franime/src/eu/kanade/tachiyomi/animeextension/fr/franime/dto/FrAnimeDto.kt
View file

@ -20,7 +20,6 @@ typealias BigIntegerJson =
@OptIn(ExperimentalSerializationApi::class)
private object BigIntegerSerializer : KSerializer<BigInteger> {
override val descriptor = PrimitiveSerialDescriptor("java.math.BigInteger", PrimitiveKind.LONG)
override fun deserialize(decoder: Decoder): BigInteger =
@ -68,7 +67,7 @@ data class Season(
@Serializable
data class Episode(
@SerialName("title") val title: String = "!No Title!",
@SerialName("title") val title: String?,
@SerialName("lang") val languages: EpisodeLanguages,
)

2
src/fr/nekosama/build.gradle
View file

@ -1,7 +1,7 @@
ext {
extName = 'NekoSama'
extClass = '.NekoSama'
extVersionCode = 11
extVersionCode = 12
isNsfw = true
}

44
src/fr/nekosama/src/eu/kanade/tachiyomi/animeextension/fr/nekosama/NekoSama.kt
View file

@ -17,6 +17,7 @@ import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.util.asJsoup
import eu.kanade.tachiyomi.util.parseAs
import kotlinx.serialization.Serializable
import okhttp3.HttpUrl
import okhttp3.Request
import okhttp3.Response
import org.jsoup.nodes.Document
@ -28,7 +29,14 @@ class NekoSama : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
override val name = "Neko-Sama"
override val baseUrl by lazy { "https://" + preferences.getString(PREF_DOMAIN_KEY, PREF_DOMAIN_DEFAULT)!! }
override val baseUrl by lazy {
val domain = preferences.getString(PREF_DOMAIN_KEY, PREF_DOMAIN_DEFAULT)!!
HttpUrl.Builder()
.scheme("https")
.host(domain)
.build()
.toString()
}
override val lang = "fr"
@ -72,17 +80,19 @@ class NekoSama : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
else -> "vostfr"
}
return when {
query.isNotBlank() -> GET("$baseUrl/animes-search-$typeSearch.json?$query")
val url = when {
query.isNotBlank() -> "$baseUrl/animes-search-$typeSearch.json?$query"
typeFilter.state != 0 || query.isNotBlank() -> when (page) {
1 -> GET("$baseUrl/${typeFilter.toUriPart()}")
else -> GET("$baseUrl/${typeFilter.toUriPart()}/$page")
1 -> "$baseUrl/${typeFilter.toUriPart()}"
else -> "$baseUrl/${typeFilter.toUriPart()}/page$page"
}
else -> when (page) {
1 -> GET("$baseUrl/anime/")
else -> GET("$baseUrl/anime/page/$page")
1 -> "$baseUrl/anime/"
else -> "$baseUrl/anime/page$page"
}
}
return GET(url)
}
override fun searchAnimeParse(response: Response): AnimesPage {
@ -95,11 +105,13 @@ class NekoSama : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
val animes = jsonSearch
.filter { it.title.orEmpty().lowercase().contains(query) }
.mapNotNull {
SAnime.create().apply {
url = it.url ?: return@mapNotNull null
val anime = SAnime.create().apply {
url = it.url?.substringAfterLast("/")?.substringBefore("-") ?: return@mapNotNull null
title = it.title ?: return@mapNotNull null
thumbnail_url = it.url_image ?: "$baseUrl/images/default_poster.png"
setUrlWithoutDomain(url) // call setUrlWithoutDomain on the SAnime instance
}
anime
}
AnimesPage(animes, false)
}
@ -131,9 +143,10 @@ class NekoSama : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
SAnime.create().apply {
val itemUrl = item.url ?: return@mapNotNull null
title = item.title ?: return@mapNotNull null
val type = itemUrl.substringAfterLast("-")
url = itemUrl.replace("episode", "info").substringBeforeLast("-").substringBeforeLast("-") + "-$type"
thumbnail_url = item.url_image ?: "$baseUrl/images/default_poster.png"
val animeId = itemUrl.substringAfterLast("/").substringBefore("-")
val titleSlug = title.replace("[^a-zA-Z0-9 -]".toRegex(), "").replace(" ", "-").lowercase()
url = "anime/info/$animeId-${titleSlug}_vostfr"
thumbnail_url = item.url_image ?: "/images/default_poster.png"
}
}
@ -179,8 +192,9 @@ class NekoSama : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
override fun episodeFromElement(element: Element) = SEpisode.create().apply {
setUrlWithoutDomain(element.attr("href"))
val text = element.text()
name = text.substringBeforeLast(" - ")
episode_number = text.substringAfterLast("- ").toFloatOrNull() ?: 0F
val episodeNumber = text.substringAfterLast("- ").toFloatOrNull() ?: 0F
name = "Épisode ${episodeNumber.toInt()}"
episode_number = episodeNumber
}
// ============================ Video Links =============================
@ -291,8 +305,8 @@ class NekoSama : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
private val PLAYERS_REGEX = Regex("video\\s*\\[\\d*]\\s*=\\s*'(.*?)'")
private const val PREF_DOMAIN_KEY = "pref_domain_key"
private const val PREF_DOMAIN_TITLE = "Preferred domain"
private const val PREF_DOMAIN_DEFAULT = "animecat.net"
private val PREF_DOMAIN_ENTRIES = arrayOf("animecat.net", "neko-sama.fr")
private const val PREF_DOMAIN_DEFAULT = "animecat.net"
private const val PREF_QUALITY_KEY = "preferred_quality"
private const val PREF_QUALITY_TITLE = "Preferred quality"