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

Madara - add Night Comic, other updates (#1855) 

Madara - add Night Comic, other updates
This commit is contained in:
Mike 2019-12-06 08:13:50 -05:00 committed by arkon
parent 6b6ad793ac
commit 8a84c691e4
3 changed files with 97 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/all/madara/build.gradle
View File

@ -5,7 +5,7 @@ ext {
appName = 'Tachiyomi: Madara (multiple sources)'
pkgNameSuffix = "all.madara"
extClass = '.MadaraFactory'
extVersionCode = 33
extVersionCode = 34
libVersion = '1.2'
}

35
src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/Madara.kt
View File

@ -283,7 +283,7 @@ abstract class Madara(
Tag("on-hold", "On Hold")
)
open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>) :
open class UriPartFilter(displayName: String, private val vals: Array<Pair<String, String>>) :
Filter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {
fun toUriPart() = vals[state].second
}
@ -386,28 +386,41 @@ abstract class Madara(
}
open fun parseChapterDate(date: String): Long? {
val lcDate = date.toLowerCase()
if (lcDate.endsWith(" ago"))
return parseRelativeDate(lcDate)
return when {
date.endsWith(" ago", ignoreCase = true) -> {
parseRelativeDate(date)
}
//Handle 'yesterday' and 'today', using midnight
if (lcDate.startsWith("year"))
return Calendar.getInstance().apply {
date.startsWith("year", ignoreCase = true) -> {
Calendar.getInstance().apply {
add(Calendar.DAY_OF_MONTH, -1) //yesterday
set(Calendar.HOUR_OF_DAY, 0)
set(Calendar.MINUTE, 0)
set(Calendar.SECOND, 0)
set(Calendar.MILLISECOND, 0)
}.timeInMillis
else if (lcDate.startsWith("today"))
return Calendar.getInstance().apply {
}
date.startsWith("today", ignoreCase = true) -> {
Calendar.getInstance().apply {
set(Calendar.HOUR_OF_DAY, 0)
set(Calendar.MINUTE, 0)
set(Calendar.SECOND, 0)
set(Calendar.MILLISECOND, 0)
}.timeInMillis
return dateFormat.parseOrNull(date)?.time
}
date.contains(Regex("""\d(st|nd|rd|th)""")) -> {
// Clean date (e.g. 5th December 2019 to 5 December 2019) before parsing it
date.split(" ").map {
if (it.contains(Regex("""\d\D\D"""))) {
it.replace(Regex("""\D"""), "")
} else {
it
}
}
.let { dateFormat.parseOrNull(it.joinToString(" "))?.time }
}
else -> dateFormat.parseOrNull(date)?.time
}
}
// Parses dates in this form:

77
src/all/madara/src/eu/kanade/tachiyomi/extension/all/madara/MadaraFactory.kt
View File

@ -60,51 +60,57 @@ class MadaraFactory : SourceFactory {
DoujinHentai(),
Azora(),
HunterFansub(),
MangaArabTeam()
MangaArabTeam(),
NightComic()
)
}
class Mangasushi : Madara("Mangasushi", "https://mangasushi.net", "en")
class NinjaScans : Madara("NinjaScans", "https://ninjascans.com", "en")
class ReadManhua : Madara("ReadManhua", "https://readmanhua.net", "en",
dateFormat = SimpleDateFormat("dd MMM yy", Locale.US))
class ZeroScans : Madara("ZeroScans", "https://zeroscans.com", "en")
class IsekaiScanCom : Madara("IsekaiScan.com", "https://isekaiscan.com/", "en")
class HappyTeaScans : Madara("Happy Tea Scans", "https://happyteascans.com/", "en")
class JustForFun : Madara("Just For Fun", "https://just-for-fun.ru/", "ru",
dateFormat = SimpleDateFormat("dd/MM/yy", Locale.US))
dateFormat = SimpleDateFormat("yy.MM.dd", Locale.US))
class AoCTranslations : Madara("Agent of Change Translations", "https://aoc.moe/", "en") {
class AoCTranslations : Madara("Agent of Change Translations", "https://aoc.moe", "en") {
override fun headersBuilder(): Headers.Builder = super.headersBuilder().add("Referer", baseUrl)
override fun popularMangaSelector() = "div.page-item-detail.manga:has(span.chapter)"
override fun chapterListSelector() = "li.wp-manga-chapter:has(a)"
override fun chapterListParse(response: Response): List<SChapter> {
val chapters = mutableListOf<SChapter>()
val document = response.asJsoup()
// For when it's a normal chapter list
if (document.select(chapterListSelector()).hasText()) {
document.select(chapterListSelector())
.map { chapters.add(chapterFromElement(it)) }
return response.asJsoup().let { document ->
document.select(chapterListSelector()).let { normalChapters ->
if (normalChapters.isNotEmpty()) {
normalChapters.map { chapterFromElement(it) }
} else {
// For their "fancy" volume/chapter lists
document.select("div.wpb_wrapper:contains(volume) a")
.filter { it.attr("href").contains(baseUrl) && !it.attr("href").contains("imgur") }
.map { it ->
val chapter = SChapter.create()
if (it.attr("href").contains("volume")) {
val volume = it.attr("href").substringAfter("volume-").substringBefore("/")
val volChap = it.attr("href").substringAfter("volume-$volume/").substringBefore("/").replace("-", " ").capitalize()
chapter.name = "Volume $volume - $volChap"
.map { volumeChapter ->
SChapter.create().apply {
volumeChapter.attr("href").let { url ->
name = if (url.contains("volume")) {
val volume = url.substringAfter("volume-").substringBefore("/")
val volChap = url.substringAfter("volume-$volume/").substringBefore("/").replace("-", " ").capitalize()
"Volume $volume - $volChap"
} else {
chapter.name = it.attr("href").substringBefore("/p").substringAfterLast("/").replace("-", " ").capitalize()
url.substringBefore("/p").substringAfterLast("/").replace("-", " ").capitalize()
}
it.attr("href").let {
chapter.setUrlWithoutDomain(it.substringBefore("?") + if (!it.endsWith("?style=list")) "?style=list" else "")
chapters.add(chapter)
setUrlWithoutDomain(url.substringBefore("?") + "?style=list")
}
}
}
return chapters.reversed()
}.reversed()
}
}
}
}
@ -120,8 +126,8 @@ class TritiniaScans : Madara("Tritinia Scans", "http://ghajik.ml/", "en",
override fun popularMangaNextPageSelector(): String? = null
}
class TsubakiNoScan : Madara("Tsubaki No Scan", "https://tsubakinoscan.com/",
"fr", dateFormat = SimpleDateFormat("dd/MM/yy", Locale.US))
class TsubakiNoScan : Madara("Tsubaki No Scan", "https://tsubakinoscan.com/","fr",
dateFormat = SimpleDateFormat("dd/MM/yy", Locale.US))
class YokaiJump : Madara("Yokai Jump", "https://yokaijump.fr/", "fr",
dateFormat = SimpleDateFormat("dd/MM/yy", Locale.US))
@ -136,7 +142,8 @@ class MangazukiClubJP : Madara("Mangazuki.club", "https://mangazuki.club/", "ja"
class MangazukiClubKO : Madara("Mangazuki.club", "https://mangazuki.club/", "ko")
class FirstKissManga : Madara("1st Kiss", "https://1stkissmanga.com/", "en") {
class FirstKissManga : Madara("1st Kiss", "https://1stkissmanga.com/", "en",
dateFormat = SimpleDateFormat("dd MMM yyyy", Locale.US)) {
override val pageListParseSelector = "div.reading-content img"
private val cdnUrl = "cdn.1stkissmanga.com"
override fun imageRequest(page: Page): Request {
@ -177,7 +184,25 @@ class YoManga : Madara("Yo Manga", "https://yomanga.info/", "en")
class ManyToon : Madara("ManyToon", "https://manytoon.com/", "en")
class ChibiManga : Madara("Chibi Manga", "http://www.cmreader.info/", "en")
class ChibiManga : Madara("Chibi Manga", "http://www.cmreader.info/", "en",
dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.US)) {
override fun chapterListParse(response: Response): List<SChapter> {
response.asJsoup().let { documet ->
documet.select("li.parent.has-child").let { volumes ->
return if (volumes.isNullOrEmpty()) {
documet.select(chapterListSelector()).map { chapterFromElement(it) }
} else {
val chapters = mutableListOf<SChapter>()
volumes.reversed().forEach { v ->
val vName = v.select("a[href^=javascript]").text()
v.select(chapterListSelector()).map { chapters.add(chapterFromElement(it).apply { name = "$vName - $name" }) }
}
chapters
}
}
}
}
}
class ZinManga : Madara("Zin Translator", "https://zinmanga.com/", "en") {
override fun headersBuilder(): Headers.Builder = super.headersBuilder()
@ -360,3 +385,5 @@ class HunterFansub : Madara("Hunter Fansub", "https://hunterfansub.com", "es") {
}
class MangaArabTeam : Madara("مانجا عرب تيم Manga Arab Team", "https://mangaarabteam.com", "ar")
class NightComic : Madara("Night Comic", "http://www.nightcomic.com", "en")