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

[RU]Grouple correct Chapter Number (#10920)

Browse Source
This commit is contained in:
e-shl 2022-02-24 18:56:46 +05:00 committed by GitHub
parent fb59633eaa
commit d11445f73b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 52 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ru/allhentai/build.gradle
View File

@ -5,7 +5,7 @@ ext {
extName = 'AllHentai' extName = 'AllHentai'
pkgNameSuffix = 'ru.allhentai' pkgNameSuffix = 'ru.allhentai'
extClass = '.AllHentai' extClass = '.AllHentai'
extVersionCode = 14 extVersionCode = 15
isNsfw = true isNsfw = true
} }

21
src/ru/allhentai/src/eu/kanade/tachiyomi/extension/ru/allhentai/AllHentai.kt
View File

@ -181,7 +181,7 @@ class AllHentai : ConfigurableSource, ParsedHttpSource() {
val urlText = urlElement.text() val urlText = urlElement.text()
val chapter = SChapter.create() val chapter = SChapter.create()
chapter.setUrlWithoutDomain(urlElement.attr("href") + "?mtr=1") chapter.setUrlWithoutDomain(urlElement.attr("href"))
var translators = "" var translators = ""
val translatorElement = urlElement.attr("title") val translatorElement = urlElement.attr("title")
@ -220,20 +220,23 @@ class AllHentai : ConfigurableSource, ParsedHttpSource() {
} }
override fun prepareNewChapter(chapter: SChapter, manga: SManga) { override fun prepareNewChapter(chapter: SChapter, manga: SManga) {
val urlChapterNumber = Regex("${manga.url}/vol([0-9])/")
val basic = Regex("""\s*([0-9]+)(\s-\s)([0-9]+)\s*""") val basic = Regex("""\s*([0-9]+)(\s-\s)([0-9]+)\s*""")
val extra = Regex("""\s*([0-9]+\sЭкстра)\s*""") val extra = Regex("""\s*([0-9]+\sЭкстра)\s*""")
val single = Regex("""\s*Сингл\s*""") val single = Regex("""\s*Сингл\s*""")
when { when {
basic.containsMatchIn(chapter.name) -> { basic.containsMatchIn(chapter.name) -> {
basic.find(chapter.name)?.let { chapter.chapter_number = chapter.url.split(urlChapterNumber)[1].toFloat()
val number = it.groups[3]?.value!! }
chapter.chapter_number = number.toFloat() extra.containsMatchIn(chapter.name) -> {
} chapter.chapter_number = chapter.url.split(urlChapterNumber)[1].toFloat()
chapter.name = chapter.name.replaceFirst(" ", " - " + chapter.chapter_number.toString() + " ")
}
single.containsMatchIn(chapter.name) -> {
chapter.chapter_number = chapter.url.split(urlChapterNumber)[1].toFloat()
chapter.name = chapter.chapter_number.toString() + " " + chapter.name
} }
extra.containsMatchIn(chapter.name) -> // Extra chapters doesn't contain chapter number
chapter.chapter_number = -2f
single.containsMatchIn(chapter.name) -> // Oneshoots, doujinshi and other mangas with one chapter
chapter.chapter_number = 1f
} }
} }

2
src/ru/mintmanga/build.gradle
View File

@ -5,7 +5,7 @@ ext {
extName = 'Mintmanga' extName = 'Mintmanga'
pkgNameSuffix = 'ru.mintmanga' pkgNameSuffix = 'ru.mintmanga'
extClass = '.Mintmanga' extClass = '.Mintmanga'
extVersionCode = 37 extVersionCode = 38
} }
dependencies { dependencies {

21
src/ru/mintmanga/src/eu/kanade/tachiyomi/extension/ru/mintmanga/Mintmanga.kt
View File

@ -213,7 +213,7 @@ class Mintmanga : ConfigurableSource, ParsedHttpSource() {
val urlText = urlElement.text() val urlText = urlElement.text()
val chapter = SChapter.create() val chapter = SChapter.create()
chapter.setUrlWithoutDomain(urlElement.attr("href") + "?mtr=1") chapter.setUrlWithoutDomain(urlElement.attr("href"))
var translators = "" var translators = ""
val translatorElement = urlElement.attr("title") val translatorElement = urlElement.attr("title")
@ -252,20 +252,23 @@ class Mintmanga : ConfigurableSource, ParsedHttpSource() {
} }
override fun prepareNewChapter(chapter: SChapter, manga: SManga) { override fun prepareNewChapter(chapter: SChapter, manga: SManga) {
val urlChapterNumber = Regex("${manga.url}/vol([0-9])/")
val basic = Regex("""\s*([0-9]+)(\s-\s)([0-9]+)\s*""") val basic = Regex("""\s*([0-9]+)(\s-\s)([0-9]+)\s*""")
val extra = Regex("""\s*([0-9]+\sЭкстра)\s*""") val extra = Regex("""\s*([0-9]+\sЭкстра)\s*""")
val single = Regex("""\s*Сингл\s*""") val single = Regex("""\s*Сингл\s*""")
when { when {
basic.containsMatchIn(chapter.name) -> { basic.containsMatchIn(chapter.name) -> {
basic.find(chapter.name)?.let { chapter.chapter_number = chapter.url.split(urlChapterNumber)[1].toFloat()
val number = it.groups[3]?.value!! }
chapter.chapter_number = number.toFloat() extra.containsMatchIn(chapter.name) -> {
} chapter.chapter_number = chapter.url.split(urlChapterNumber)[1].toFloat()
chapter.name = chapter.name.replaceFirst(" ", " - " + chapter.chapter_number.toString() + " ")
}
single.containsMatchIn(chapter.name) -> {
chapter.chapter_number = chapter.url.split(urlChapterNumber)[1].toFloat()
chapter.name = chapter.chapter_number.toString() + " " + chapter.name
} }
extra.containsMatchIn(chapter.name) -> // Extra chapters doesn't contain chapter number
chapter.chapter_number = -2f
single.containsMatchIn(chapter.name) -> // Oneshoots, doujinshi and other mangas with one chapter
chapter.chapter_number = 1f
} }
} }

2
src/ru/readmanga/build.gradle
View File

@ -5,7 +5,7 @@ ext {
extName = 'Readmanga' extName = 'Readmanga'
pkgNameSuffix = 'ru.readmanga' pkgNameSuffix = 'ru.readmanga'
extClass = '.Readmanga' extClass = '.Readmanga'
extVersionCode = 36 extVersionCode = 37
} }
dependencies { dependencies {

21
src/ru/readmanga/src/eu/kanade/tachiyomi/extension/ru/readmanga/Readmanga.kt
View File

@ -214,7 +214,7 @@ class Readmanga : ConfigurableSource, ParsedHttpSource() {
val urlText = urlElement.text() val urlText = urlElement.text()
val chapter = SChapter.create() val chapter = SChapter.create()
chapter.setUrlWithoutDomain(urlElement.attr("href") + "?mtr=1") chapter.setUrlWithoutDomain(urlElement.attr("href"))
var translators = "" var translators = ""
val translatorElement = urlElement.attr("title") val translatorElement = urlElement.attr("title")
@ -253,20 +253,23 @@ class Readmanga : ConfigurableSource, ParsedHttpSource() {
} }
override fun prepareNewChapter(chapter: SChapter, manga: SManga) { override fun prepareNewChapter(chapter: SChapter, manga: SManga) {
val urlChapterNumber = Regex("${manga.url}/vol([0-9])/")
val basic = Regex("""\s*([0-9]+)(\s-\s)([0-9]+)\s*""") val basic = Regex("""\s*([0-9]+)(\s-\s)([0-9]+)\s*""")
val extra = Regex("""\s*([0-9]+\sЭкстра)\s*""") val extra = Regex("""\s*([0-9]+\sЭкстра)\s*""")
val single = Regex("""\s*Сингл\s*""") val single = Regex("""\s*Сингл\s*""")
when { when {
basic.containsMatchIn(chapter.name) -> { basic.containsMatchIn(chapter.name) -> {
basic.find(chapter.name)?.let { chapter.chapter_number = chapter.url.split(urlChapterNumber)[1].toFloat()
val number = it.groups[3]?.value!! }
chapter.chapter_number = number.toFloat() extra.containsMatchIn(chapter.name) -> {
} chapter.chapter_number = chapter.url.split(urlChapterNumber)[1].toFloat()
chapter.name = chapter.name.replaceFirst(" ", " - " + chapter.chapter_number.toString() + " ")
}
single.containsMatchIn(chapter.name) -> {
chapter.chapter_number = chapter.url.split(urlChapterNumber)[1].toFloat()
chapter.name = chapter.chapter_number.toString() + " " + chapter.name
} }
extra.containsMatchIn(chapter.name) -> // Extra chapters doesn't contain chapter number
chapter.chapter_number = -2f
single.containsMatchIn(chapter.name) -> // Oneshoots, doujinshi and other mangas with one chapter
chapter.chapter_number = 1f
} }
} }

2
src/ru/selfmanga/build.gradle
View File

@ -5,7 +5,7 @@ ext {
extName = 'Selfmanga' extName = 'Selfmanga'
pkgNameSuffix = 'ru.selfmanga' pkgNameSuffix = 'ru.selfmanga'
extClass = '.Selfmanga' extClass = '.Selfmanga'
extVersionCode = 14 extVersionCode = 15
} }
dependencies { dependencies {

21
src/ru/selfmanga/src/eu/kanade/tachiyomi/extension/ru/selfmanga/Selfmanga.kt
View File

@ -118,7 +118,7 @@ class Selfmanga : ParsedHttpSource() {
val urlText = urlElement.text() val urlText = urlElement.text()
val chapter = SChapter.create() val chapter = SChapter.create()
chapter.setUrlWithoutDomain(urlElement.attr("href") + "?mtr=1") chapter.setUrlWithoutDomain(urlElement.attr("href"))
if (urlText.endsWith(" новое")) { if (urlText.endsWith(" новое")) {
chapter.name = urlText.dropLast(6) chapter.name = urlText.dropLast(6)
} else { } else {
@ -135,20 +135,23 @@ class Selfmanga : ParsedHttpSource() {
} }
override fun prepareNewChapter(chapter: SChapter, manga: SManga) { override fun prepareNewChapter(chapter: SChapter, manga: SManga) {
val urlChapterNumber = Regex("${manga.url}/vol([0-9])/")
val basic = Regex("""\s*([0-9]+)(\s-\s)([0-9]+)\s*""") val basic = Regex("""\s*([0-9]+)(\s-\s)([0-9]+)\s*""")
val extra = Regex("""\s*([0-9]+\sЭкстра)\s*""") val extra = Regex("""\s*([0-9]+\sЭкстра)\s*""")
val single = Regex("""\s*Сингл\s*""") val single = Regex("""\s*Сингл\s*""")
when { when {
basic.containsMatchIn(chapter.name) -> { basic.containsMatchIn(chapter.name) -> {
basic.find(chapter.name)?.let { chapter.chapter_number = chapter.url.split(urlChapterNumber)[1].toFloat()
val number = it.groups[3]?.value!! }
chapter.chapter_number = number.toFloat() extra.containsMatchIn(chapter.name) -> {
} chapter.chapter_number = chapter.url.split(urlChapterNumber)[1].toFloat()
chapter.name = chapter.name.replaceFirst(" ", " - " + chapter.chapter_number.toString() + " ")
}
single.containsMatchIn(chapter.name) -> {
chapter.chapter_number = chapter.url.split(urlChapterNumber)[1].toFloat()
chapter.name = chapter.chapter_number.toString() + " " + chapter.name
} }
extra.containsMatchIn(chapter.name) -> // Extra chapters doesn't contain chapter number
chapter.chapter_number = -2f
single.containsMatchIn(chapter.name) -> // Oneshoots, doujinshi and other mangas with one chapter
chapter.chapter_number = 1f
} }
} }