From ef2c7c761dfbf7e733f08887a1691a6e42060425 Mon Sep 17 00:00:00 2001 From: e-shl <35057681+e-shl@users.noreply.github.com> Date: Sun, 27 Feb 2022 19:48:14 +0500 Subject: [PATCH] [RU]Grouple disable library redirects (again and limit) (#10941) * [RU]Grouple disable library redirects (again and limit) * chapter_number get rid of zero * minimizing erroneous site numbering chapters (visibility only name) --- src/ru/allhentai/build.gradle | 2 +- .../tachiyomi/extension/ru/allhentai/AllHentai.kt | 11 +++++++---- src/ru/mintmanga/build.gradle | 2 +- .../tachiyomi/extension/ru/mintmanga/Mintmanga.kt | 11 +++++++---- src/ru/readmanga/build.gradle | 2 +- .../tachiyomi/extension/ru/readmanga/Readmanga.kt | 11 +++++++---- src/ru/selfmanga/build.gradle | 2 +- .../tachiyomi/extension/ru/selfmanga/Selfmanga.kt | 11 +++++++---- 8 files changed, 32 insertions(+), 20 deletions(-) diff --git a/src/ru/allhentai/build.gradle b/src/ru/allhentai/build.gradle index 046f3162f..c2e7ab118 100644 --- a/src/ru/allhentai/build.gradle +++ b/src/ru/allhentai/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'AllHentai' pkgNameSuffix = 'ru.allhentai' extClass = '.AllHentai' - extVersionCode = 16 + extVersionCode = 17 isNsfw = true } diff --git a/src/ru/allhentai/src/eu/kanade/tachiyomi/extension/ru/allhentai/AllHentai.kt b/src/ru/allhentai/src/eu/kanade/tachiyomi/extension/ru/allhentai/AllHentai.kt index 2e4186c30..9bc7d718c 100644 --- a/src/ru/allhentai/src/eu/kanade/tachiyomi/extension/ru/allhentai/AllHentai.kt +++ b/src/ru/allhentai/src/eu/kanade/tachiyomi/extension/ru/allhentai/AllHentai.kt @@ -25,6 +25,7 @@ import org.jsoup.nodes.Element import rx.Observable import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get +import java.text.DecimalFormat import java.text.ParseException import java.text.SimpleDateFormat import java.util.Locale @@ -49,10 +50,10 @@ class AllHentai : ConfigurableSource, ParsedHttpSource() { override val client: OkHttpClient = network.client.newBuilder() .addNetworkInterceptor(rateLimitInterceptor) - .addInterceptor { chain -> + .addNetworkInterceptor { chain -> val originalRequest = chain.request() val response = chain.proceed(originalRequest) - if (originalRequest.url.toString().contains("internal/redirect") or (response.code == 301)) + if (originalRequest.url.toString().contains(baseUrl) and (originalRequest.url.toString().contains("internal/redirect") or (response.code == 301))) throw Exception("Манга переехала на другой адрес/ссылку!") response } @@ -235,11 +236,13 @@ class AllHentai : ConfigurableSource, ParsedHttpSource() { val single = Regex("""\s*Сингл\s*""") when { extra.containsMatchIn(chapter.name) -> { - chapter.name = chapter.name.replaceFirst(" ", " - " + chapter.chapter_number.toString() + " ") + if (chapter.name.substringAfter("Экстра").trim().isEmpty()) + chapter.name = chapter.name.replaceFirst(" ", " - " + DecimalFormat("#,###.##").format(chapter.chapter_number).replace(",", ".") + " ") } single.containsMatchIn(chapter.name) -> { - chapter.name = chapter.chapter_number.toString() + " " + chapter.name + if (chapter.name.substringAfter("Сингл").trim().isEmpty()) + chapter.name = DecimalFormat("#,###.##").format(chapter.chapter_number).replace(",", ".") + " " + chapter.name } } } diff --git a/src/ru/mintmanga/build.gradle b/src/ru/mintmanga/build.gradle index c79203b5c..b37c6730b 100644 --- a/src/ru/mintmanga/build.gradle +++ b/src/ru/mintmanga/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'Mintmanga' pkgNameSuffix = 'ru.mintmanga' extClass = '.Mintmanga' - extVersionCode = 39 + extVersionCode = 40 } dependencies { diff --git a/src/ru/mintmanga/src/eu/kanade/tachiyomi/extension/ru/mintmanga/Mintmanga.kt b/src/ru/mintmanga/src/eu/kanade/tachiyomi/extension/ru/mintmanga/Mintmanga.kt index c96725bfe..d56822624 100644 --- a/src/ru/mintmanga/src/eu/kanade/tachiyomi/extension/ru/mintmanga/Mintmanga.kt +++ b/src/ru/mintmanga/src/eu/kanade/tachiyomi/extension/ru/mintmanga/Mintmanga.kt @@ -25,6 +25,7 @@ import org.jsoup.nodes.Element import rx.Observable import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get +import java.text.DecimalFormat import java.text.ParseException import java.text.SimpleDateFormat import java.util.Locale @@ -48,10 +49,10 @@ class Mintmanga : ConfigurableSource, ParsedHttpSource() { override val client: OkHttpClient = network.client.newBuilder() .addNetworkInterceptor(rateLimitInterceptor) - .addInterceptor { chain -> + .addNetworkInterceptor { chain -> val originalRequest = chain.request() val response = chain.proceed(originalRequest) - if (originalRequest.url.toString().contains("internal/redirect") or (response.code == 301)) + if (originalRequest.url.toString().contains(baseUrl) and (originalRequest.url.toString().contains("internal/redirect") or (response.code == 301))) throw Exception("Манга переехала на другой адрес/ссылку!") response } @@ -267,11 +268,13 @@ class Mintmanga : ConfigurableSource, ParsedHttpSource() { val single = Regex("""\s*Сингл\s*""") when { extra.containsMatchIn(chapter.name) -> { - chapter.name = chapter.name.replaceFirst(" ", " - " + chapter.chapter_number.toString() + " ") + if (chapter.name.substringAfter("Экстра").trim().isEmpty()) + chapter.name = chapter.name.replaceFirst(" ", " - " + DecimalFormat("#,###.##").format(chapter.chapter_number).replace(",", ".") + " ") } single.containsMatchIn(chapter.name) -> { - chapter.name = chapter.chapter_number.toString() + " " + chapter.name + if (chapter.name.substringAfter("Сингл").trim().isEmpty()) + chapter.name = DecimalFormat("#,###.##").format(chapter.chapter_number).replace(",", ".") + " " + chapter.name } } } diff --git a/src/ru/readmanga/build.gradle b/src/ru/readmanga/build.gradle index 659a90797..ab5d77aab 100644 --- a/src/ru/readmanga/build.gradle +++ b/src/ru/readmanga/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'Readmanga' pkgNameSuffix = 'ru.readmanga' extClass = '.Readmanga' - extVersionCode = 38 + extVersionCode = 39 } dependencies { diff --git a/src/ru/readmanga/src/eu/kanade/tachiyomi/extension/ru/readmanga/Readmanga.kt b/src/ru/readmanga/src/eu/kanade/tachiyomi/extension/ru/readmanga/Readmanga.kt index 168397111..185ada3a2 100644 --- a/src/ru/readmanga/src/eu/kanade/tachiyomi/extension/ru/readmanga/Readmanga.kt +++ b/src/ru/readmanga/src/eu/kanade/tachiyomi/extension/ru/readmanga/Readmanga.kt @@ -25,6 +25,7 @@ import org.jsoup.nodes.Element import rx.Observable import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get +import java.text.DecimalFormat import java.text.ParseException import java.text.SimpleDateFormat import java.util.Locale @@ -48,10 +49,10 @@ class Readmanga : ConfigurableSource, ParsedHttpSource() { override val client: OkHttpClient = network.client.newBuilder() .addNetworkInterceptor(rateLimitInterceptor) - .addInterceptor { chain -> + .addNetworkInterceptor { chain -> val originalRequest = chain.request() val response = chain.proceed(originalRequest) - if (originalRequest.url.toString().contains("internal/redirect") or (response.code == 301)) + if (originalRequest.url.toString().contains(baseUrl) and (originalRequest.url.toString().contains("internal/redirect") or (response.code == 301))) throw Exception("Манга переехала на другой адрес/ссылку!") response } @@ -268,11 +269,13 @@ class Readmanga : ConfigurableSource, ParsedHttpSource() { val single = Regex("""\s*Сингл\s*""") when { extra.containsMatchIn(chapter.name) -> { - chapter.name = chapter.name.replaceFirst(" ", " - " + chapter.chapter_number.toString() + " ") + if (chapter.name.substringAfter("Экстра").trim().isEmpty()) + chapter.name = chapter.name.replaceFirst(" ", " - " + DecimalFormat("#,###.##").format(chapter.chapter_number).replace(",", ".") + " ") } single.containsMatchIn(chapter.name) -> { - chapter.name = chapter.chapter_number.toString() + " " + chapter.name + if (chapter.name.substringAfter("Сингл").trim().isEmpty()) + chapter.name = DecimalFormat("#,###.##").format(chapter.chapter_number).replace(",", ".") + " " + chapter.name } } } diff --git a/src/ru/selfmanga/build.gradle b/src/ru/selfmanga/build.gradle index 6c29083ce..40a69c1d3 100644 --- a/src/ru/selfmanga/build.gradle +++ b/src/ru/selfmanga/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'Selfmanga' pkgNameSuffix = 'ru.selfmanga' extClass = '.Selfmanga' - extVersionCode = 16 + extVersionCode = 17 } dependencies { diff --git a/src/ru/selfmanga/src/eu/kanade/tachiyomi/extension/ru/selfmanga/Selfmanga.kt b/src/ru/selfmanga/src/eu/kanade/tachiyomi/extension/ru/selfmanga/Selfmanga.kt index 9361adf0d..b0687deed 100644 --- a/src/ru/selfmanga/src/eu/kanade/tachiyomi/extension/ru/selfmanga/Selfmanga.kt +++ b/src/ru/selfmanga/src/eu/kanade/tachiyomi/extension/ru/selfmanga/Selfmanga.kt @@ -15,6 +15,7 @@ import okhttp3.Request import okhttp3.Response import org.jsoup.nodes.Document import org.jsoup.nodes.Element +import java.text.DecimalFormat import java.text.ParseException import java.text.SimpleDateFormat import java.util.Locale @@ -34,10 +35,10 @@ class Selfmanga : ParsedHttpSource() { override val client: OkHttpClient = network.client.newBuilder() .addNetworkInterceptor(rateLimitInterceptor) - .addInterceptor { chain -> + .addNetworkInterceptor { chain -> val originalRequest = chain.request() val response = chain.proceed(originalRequest) - if (originalRequest.url.toString().contains("internal/redirect") or (response.code == 301)) + if (originalRequest.url.toString().contains(baseUrl) and (originalRequest.url.toString().contains("internal/redirect") or (response.code == 301))) throw Exception("Манга переехала на другой адрес/ссылку!") response } @@ -151,11 +152,13 @@ class Selfmanga : ParsedHttpSource() { val single = Regex("""\s*Сингл\s*""") when { extra.containsMatchIn(chapter.name) -> { - chapter.name = chapter.name.replaceFirst(" ", " - " + chapter.chapter_number.toString() + " ") + if (chapter.name.substringAfter("Экстра").trim().isEmpty()) + chapter.name = chapter.name.replaceFirst(" ", " - " + DecimalFormat("#,###.##").format(chapter.chapter_number).replace(",", ".") + " ") } single.containsMatchIn(chapter.name) -> { - chapter.name = chapter.chapter_number.toString() + " " + chapter.name + if (chapter.name.substringAfter("Сингл").trim().isEmpty()) + chapter.name = DecimalFormat("#,###.##").format(chapter.chapter_number).replace(",", ".") + " " + chapter.name } } }