diff --git a/.github/workflows/issue_moderator.yml b/.github/workflows/issue_moderator.yml index 0b9c84da0..1caa5f61b 100644 --- a/.github/workflows/issue_moderator.yml +++ b/.github/workflows/issue_moderator.yml @@ -43,7 +43,7 @@ jobs: }, { "type": "both", - "regex": ".*(team\\s*x|tqneplus|komiktap|gourmet\\s*scans|mangawow|hikari\\s*scans|mangagegecesi|knightnoscanlations|ahstudios|mangagecesi|nartag|xxx\\s*yaoi|yaoi\\s*fan\\s*clube|luminous|dragontea|manhwaid\\.org|hunters\\s*scan|mnhaestate|reset(?:\\s*|-)scan|manga-flix\\.com|astra\\s*scans|manganoon|manga(?:-|\\s*)pro|coven\\s*scans?|shinobiscans|plot ?twist ?no ?fansub(?: ?scans?)?|plot-twistnf-scans(?:\\.com)?).*", + "regex": ".*(komiktap|gourmet\\s*scans|mangawow|hikari\\s*scans|mangagegecesi|knightnoscanlations|ahstudios|mangagecesi|nartag|xxx\\s*yaoi|yaoi\\s*fan\\s*clube|luminous|dragontea|manhwaid\\.org|hunters\\s*scan|reset(?:\\s*|-)scan|manga-flix\\.com|astra\\s*scans|manganoon|manga(?:-|\\s*)pro|coven\\s*scans?|shinobiscans|plot ?twist ?no ?fansub(?: ?scans?)?|plot-twistnf-scans(?:\\.com)?).*", "ignoreCase": true, "message": "{match} will not be added back as the scanlator team has requested it to be removed. Read #3475 for more information." }, diff --git a/REMOVED_SOURCES.md b/REMOVED_SOURCES.md index a47b2128a..2b7c3c031 100644 --- a/REMOVED_SOURCES.md +++ b/REMOVED_SOURCES.md @@ -44,6 +44,5 @@ - Reset Scans https://github.com/tachiyomiorg/tachiyomi-extensions/issues/13168 - SetsuScans https://github.com/tachiyomiorg/tachiyomi-extensions/issues/11040 - ShinobiScans https://github.com/tachiyomiorg/tachiyomi-extensions/issues/14457 -- TeamX/tqneplus https://github.com/tachiyomiorg/tachiyomi-extensions/issues/4875 - XXX Yaoi https://github.com/tachiyomiorg/tachiyomi-extensions/issues/9535 - Yaoi Fan Clube https://github.com/tachiyomiorg/tachiyomi-extensions/issues/9605 diff --git a/src/ar/teamx/AndroidManifest.xml b/src/ar/teamx/AndroidManifest.xml new file mode 100644 index 000000000..30deb7f79 --- /dev/null +++ b/src/ar/teamx/AndroidManifest.xml @@ -0,0 +1,2 @@ + + diff --git a/src/ar/teamx/build.gradle b/src/ar/teamx/build.gradle new file mode 100644 index 000000000..d8079275e --- /dev/null +++ b/src/ar/teamx/build.gradle @@ -0,0 +1,12 @@ +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' + +ext { + extName = 'Team X' + pkgNameSuffix = 'ar.teamx' + extClass = '.TeamX' + extVersionCode = 10 + libVersion = '1.2' +} + +apply from: "$rootDir/common.gradle" diff --git a/src/ar/teamx/res/mipmap-hdpi/ic_launcher.png b/src/ar/teamx/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..56a895c40 Binary files /dev/null and b/src/ar/teamx/res/mipmap-hdpi/ic_launcher.png differ diff --git a/src/ar/teamx/res/mipmap-mdpi/ic_launcher.png b/src/ar/teamx/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..c4cbda740 Binary files /dev/null and b/src/ar/teamx/res/mipmap-mdpi/ic_launcher.png differ diff --git a/src/ar/teamx/res/mipmap-xhdpi/ic_launcher.png b/src/ar/teamx/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..74f832995 Binary files /dev/null and b/src/ar/teamx/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/src/ar/teamx/res/mipmap-xxhdpi/ic_launcher.png b/src/ar/teamx/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..52aa5662a Binary files /dev/null and b/src/ar/teamx/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/src/ar/teamx/res/mipmap-xxxhdpi/ic_launcher.png b/src/ar/teamx/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..be7afc74c Binary files /dev/null and b/src/ar/teamx/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/src/ar/teamx/res/web_hi_res_512.png b/src/ar/teamx/res/web_hi_res_512.png new file mode 100644 index 000000000..12cfe7ef5 Binary files /dev/null and b/src/ar/teamx/res/web_hi_res_512.png differ diff --git a/src/ar/teamx/src/eu/kanade/tachiyomi/extension/ar/teamx/TeamX.kt b/src/ar/teamx/src/eu/kanade/tachiyomi/extension/ar/teamx/TeamX.kt new file mode 100644 index 000000000..5915c894d --- /dev/null +++ b/src/ar/teamx/src/eu/kanade/tachiyomi/extension/ar/teamx/TeamX.kt @@ -0,0 +1,192 @@ +package eu.kanade.tachiyomi.extension.ar.teamx + +import eu.kanade.tachiyomi.network.GET +import eu.kanade.tachiyomi.network.interceptor.rateLimit +import eu.kanade.tachiyomi.source.model.FilterList +import eu.kanade.tachiyomi.source.model.MangasPage +import eu.kanade.tachiyomi.source.model.Page +import eu.kanade.tachiyomi.source.model.SChapter +import eu.kanade.tachiyomi.source.model.SManga +import eu.kanade.tachiyomi.source.online.ParsedHttpSource +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 java.text.SimpleDateFormat +import java.util.Locale +import java.util.concurrent.TimeUnit + +class TeamX : ParsedHttpSource() { + + override val name = "Team X" + + override val baseUrl = "https://team1x1.fun" + + override val lang = "ar" + + override val supportsLatest = true + + override val client: OkHttpClient = network.cloudflareClient.newBuilder() + .connectTimeout(15, TimeUnit.SECONDS) + .readTimeout(30, TimeUnit.SECONDS) + .rateLimit(10, 1, TimeUnit.SECONDS) + .build() + + // Popular + + override fun popularMangaRequest(page: Int): Request { + return GET("$baseUrl/series/" + if (page > 1) "?page=$page" else "", headers) + } + + override fun popularMangaSelector() = "div.listupd div.bsx" + + override fun popularMangaFromElement(element: Element): SManga { + return SManga.create().apply { + title = element.select("a").attr("title") + setUrlWithoutDomain(element.select("a").first().attr("href")) + thumbnail_url = element.select("img").let { + if (it.hasAttr("data-src")) + it.attr("abs:data-src") else it.attr("abs:src") + } + } + } + + override fun popularMangaNextPageSelector() = "a[rel=next]" + + // Latest + + private val titlesAdded = mutableSetOf() + + override fun latestUpdatesRequest(page: Int): Request { + if (page == 1) titlesAdded.clear() + + return GET(baseUrl + if (page > 1) "?page=$page" else "", headers) + } + + override fun latestUpdatesParse(response: Response): MangasPage { + val document = response.asJsoup() + + val unfilteredManga = document.select(latestUpdatesSelector()) + + val mangaList = unfilteredManga.map { element -> + latestUpdatesFromElement(element) + }.distinctBy { + it.title + }.filter { + !titlesAdded.contains(it.title) + } + + titlesAdded.addAll(mangaList.map { it.title }) + + return MangasPage(mangaList, document.select(latestUpdatesNextPageSelector()).isNotEmpty()) + } + + override fun latestUpdatesSelector() = "div.last-chapter div.box" + + override fun latestUpdatesFromElement(element: Element): SManga { + return SManga.create().apply { + val linkElement = element.select("div.info a") + title = linkElement.select("h3").text() + setUrlWithoutDomain(linkElement.first().attr("href")) + thumbnail_url = element.select("div.imgu img").first().absUrl("src") + } + } + + override fun latestUpdatesNextPageSelector() = popularMangaNextPageSelector() + + // Search + + override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { + if (page == 1) titlesAdded.clear() + return GET("$baseUrl/series" + "?search=$query" + (if (page > 1) "&page=$page" else ""), headers) + } + + override fun searchMangaParse(response: Response): MangasPage = popularMangaParse(response) + + override fun searchMangaSelector() = popularMangaSelector() + + override fun searchMangaFromElement(element: Element): SManga = popularMangaFromElement(element) + + override fun searchMangaNextPageSelector() = popularMangaNextPageSelector() + + // Details + + override fun mangaDetailsParse(document: Document): SManga { + return SManga.create().apply { + title = document.select("div.author-info-title h1").text() + description = document.select("div.review-content").text() + if (description.isNullOrBlank()) { + description = document.select("div.review-content p").text() + } + genre = document.select("div.review-author-info a").joinToString { it.text() } + thumbnail_url = document.select("div.text-right img").first().absUrl("src") + } + } + + // Chapters + private fun chapterNextPageSelector() = "span.nextx_text a:contains(ยป)" + + override fun chapterListParse(response: Response): List { + val allChapters = mutableListOf() + var document = response.asJsoup() + + while (true) { + val pageChapters = document.select(chapterListSelector()).map { chapterFromElement(it) } + if (pageChapters.isEmpty()) + break + + allChapters += pageChapters + + val hasNextPage = document.select(chapterNextPageSelector()).isNotEmpty() + if (!hasNextPage) + break + + val nextUrl = document.select(chapterNextPageSelector()).attr("href") + document = client.newCall(GET(nextUrl, headers)).execute().asJsoup() + } + + return allChapters + } + + override fun chapterListSelector() = "div.eplister ul a" + + override fun chapterFromElement(element: Element): SChapter { + return SChapter.create().apply { + + val chpNum = element.select("div.epl-num").text() + val chpTitle = element.select("div.epl-title").text() + + name = when (chpNum.isNullOrBlank()) { + true -> chpTitle + false -> "$chpNum - $chpTitle" + } + + date_upload = parseChapterDate(element.select("div.epl-date").text()) + + setUrlWithoutDomain(element.attr("href")) + } + } + + private fun parseChapterDate(date: String): Long { + return kotlin.runCatching { + SimpleDateFormat("yyyy-MM-dd hh:mm:ss", Locale.getDefault()).parse(date)?.time + } + .getOrNull() ?: 0 + } + + // Pages + + override fun pageListParse(document: Document): List { + return document.select("div.image_list img").mapIndexed { i, img -> + Page( + i, + "", + img.absUrl("src") + ) + } + } + + override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException("Not used") +}