Draff/Tachiyomi-Extensions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Title showing genre, added status(ongoing/complete) and added announcements (Tapas Extension) (#11715)

Browse Source 
* Minor Fixes

* Minor Fixes

* Fixed Title showing genre, added status(ongoing/complete) and added announcements

* acted on the review

Co-authored-by: Abhay Singh <sinnghabhay80@gmail.com>
This commit is contained in:
sinnghabhay80 2022-05-06 04:07:32 +05:30 committed by GitHub
parent 6b742f6726
commit c32f049eb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.run/MadaraGenerator.run.xml
View File

@ -14,4 +14,4 @@
<option name="Gradle.BeforeRunTask" enabled="true" tasks="ktLint" externalProjectPath="$PROJECT_DIR$/multisrc" vmOptions="" scriptParameters="" /> <option name="Gradle.BeforeRunTask" enabled="true" tasks="ktLint" externalProjectPath="$PROJECT_DIR$/multisrc" vmOptions="" scriptParameters="" />
</method> </method>
</configuration> </configuration>
</component> </component>

2
src/en/tapastic/build.gradle
View File

@ -6,7 +6,7 @@ ext {
extName = 'Tapas' extName = 'Tapas'
pkgNameSuffix = 'en.tapastic' pkgNameSuffix = 'en.tapastic'
extClass = '.Tapastic' extClass = '.Tapastic'
extVersionCode = 15 extVersionCode = 16
} }
apply from: "$rootDir/common.gradle" apply from: "$rootDir/common.gradle"

50
src/en/tapastic/src/eu/kanade/tachiyomi/extension/en/tapastic/Tapastic.kt
View File

@ -159,10 +159,41 @@ class Tapastic : ConfigurableSource, ParsedHttpSource() {
override fun popularMangaSelector() = "li.js-list-item" override fun popularMangaSelector() = "li.js-list-item"
override fun popularMangaFromElement(element: Element) = SManga.create().apply { override fun popularMangaFromElement(element: Element) = SManga.create().apply {
url = element.select(".item__thumb a").attr("href") url = element.select(".item__thumb a").attr("href")
title = element.select(".item__thumb img").attr("alt") title = toTitle(element.select(".item__thumb img").attr("alt"))
thumbnail_url = element.select(".item__thumb img").attr("src") thumbnail_url = element.select(".item__thumb img").attr("src")
} }
private class Genre {
companion object {
val genreArray = arrayOf(
"Any",
"Action",
"Boys Love",
"Comedy",
"Drama",
"Fantasy",
"Girls Love",
"Gaming",
"Horror",
"LGBTQ+",
"Mystery",
"Romance",
"Science Fiction",
"Slice of Life"
)
}
}
private fun toTitle(str: String): String {
for (genre in Genre.genreArray) {
val extraTitle = ("Tapas " + genre.plus(" "))
if (str.contains(extraTitle, ignoreCase = true)) {
return str.replace(extraTitle, "")
}
}
return str
}
// Latest // Latest
override fun latestUpdatesRequest(page: Int): Request = override fun latestUpdatesRequest(page: Int): Request =
@ -218,7 +249,7 @@ class Tapastic : ConfigurableSource, ParsedHttpSource() {
override fun searchMangaSelector() = "${popularMangaSelector()}, .search-item-wrap" override fun searchMangaSelector() = "${popularMangaSelector()}, .search-item-wrap"
override fun searchMangaFromElement(element: Element): SManga = SManga.create().apply { override fun searchMangaFromElement(element: Element): SManga = SManga.create().apply {
url = element.select(".item__thumb a, .title-section .title a").attr("href") url = element.select(".item__thumb a, .title-section .title a").attr("href")
title = element.select(".item__thumb img").firstOrNull()?.attr("alt") ?: element.select(".title-section .title a").text() title = toTitle(element.select(".item__thumb img").firstOrNull()?.attr("alt") ?: element.select(".title-section .title a").text())
thumbnail_url = element.select(".item__thumb img, .thumb-wrap img").attr("src") thumbnail_url = element.select(".item__thumb img, .thumb-wrap img").attr("src")
} }
@ -234,7 +265,20 @@ class Tapastic : ConfigurableSource, ParsedHttpSource() {
thumbnail_url = document.select("div.thumb-wrapper img").attr("abs:src") thumbnail_url = document.select("div.thumb-wrapper img").attr("abs:src")
author = document.select("ul.creator-section a.name").joinToString { it.text() } author = document.select("ul.creator-section a.name").joinToString { it.text() }
artist = author artist = author
description = document.select("div.row-body span.description__body").text() status = document.select("div.schedule span.schedule-label").text().toStatus()
val announcementName: String? = document.select("div.series-announcement div.announcement__text p").text()
val announcementText: String? = document.select("div.announcement__body p.js-announcement-text").text()
description = if (announcementName.isNullOrEmpty() || announcementText.isNullOrEmpty()) {
document.select("div.row-body span.description__body").text()
} else {
announcementName.plus("\n") + announcementText.plus("\n\n") + document.select("div.row-body span.description__body").text()
}
}
private fun String.toStatus() = when {
this.contains("Updates", ignoreCase = true) -> SManga.ONGOING
this.contains("Completed", ignoreCase = true) -> SManga.COMPLETED
else -> SManga.UNKNOWN
} }
// Chapters // Chapters