From e61c2d72c70ec48b6b6ef4b01261b6477dcdf918 Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 2 Aug 2020 18:55:14 -0400 Subject: [PATCH] Update issue templates, output gzipped version of repo JSON --- .github/ISSUE_TEMPLATE.md | 2 +- .github/ISSUE_TEMPLATE/feature_request.md | 2 +- .github/ISSUE_TEMPLATE/meta_request.md | 2 +- .github/ISSUE_TEMPLATE/source_bug.md | 2 +- .github/ISSUE_TEMPLATE/source_request.md | 2 +- .travis/create-repo.sh | 5 ++++- .../eu/kanade/tachiyomi/extension/all/ehentai/EHentai.kt | 6 +++--- .../src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt | 8 ++++---- .../tachiyomi/extension/all/webtoons/WebtoonsDefault.kt | 6 +++--- .../kanade/tachiyomi/extension/all/wpcomics/WPComics.kt | 6 +++--- .../tachiyomi/extension/all/wpcomics/WPComicsFactory.kt | 6 +++--- .../extension/ar/andromedascans/AndromedaScans.kt | 6 +++--- .../eu/kanade/tachiyomi/extension/ar/mangazen/MangaZen.kt | 6 +++--- .../tachiyomi/extension/en/comicastle/Comicastle.kt | 6 +++--- .../kanade/tachiyomi/extension/en/mangafast/MangaFast.kt | 6 +++--- 15 files changed, 37 insertions(+), 34 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 0707209b3..548c42040 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -2,7 +2,7 @@ I acknowledge that: -- I have updated to the latest version of the app (stable is v0.9.2) +- I have updated to the latest version of the app (stable is v0.10.2) - I have updated all extensions - If this is an issue with the app itself, that I should be opening an issue in https://github.com/inorichi/tachiyomi - I have searched the existing issues for duplicates diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 6fb2c3606..55794f027 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -9,7 +9,7 @@ labels: "enhancement" I acknowledge that: -- I have updated to the latest version of the app (stable is v0.9.2) +- I have updated to the latest version of the app (stable is v0.10.2) - I have updated all extensions - If this is an issue with the app itself, that I should be opening an issue in https://github.com/inorichi/tachiyomi - I have searched the existing issues for duplicates diff --git a/.github/ISSUE_TEMPLATE/meta_request.md b/.github/ISSUE_TEMPLATE/meta_request.md index 881360e64..295981a39 100644 --- a/.github/ISSUE_TEMPLATE/meta_request.md +++ b/.github/ISSUE_TEMPLATE/meta_request.md @@ -9,7 +9,7 @@ labels: "meta" I acknowledge that: -- I have updated to the latest version of the app (stable is v0.9.2) +- I have updated to the latest version of the app (stable is v0.10.2) - I have updated all extensions - If this is an issue with the app itself, that I should be opening an issue in https://github.com/inorichi/tachiyomi - I have searched the existing issues for duplicates diff --git a/.github/ISSUE_TEMPLATE/source_bug.md b/.github/ISSUE_TEMPLATE/source_bug.md index 2fdf2ed76..3924adcc9 100644 --- a/.github/ISSUE_TEMPLATE/source_bug.md +++ b/.github/ISSUE_TEMPLATE/source_bug.md @@ -9,7 +9,7 @@ labels: "bug" I acknowledge that: -- I have updated to the latest version of the app (stable is v0.9.2) +- I have updated to the latest version of the app (stable is v0.10.2) - I have updated all extensions - If this is an issue with the app itself, that I should be opening an issue in https://github.com/inorichi/tachiyomi - I have searched the existing issues for duplicates diff --git a/.github/ISSUE_TEMPLATE/source_request.md b/.github/ISSUE_TEMPLATE/source_request.md index 28efe475c..4a7d08bbf 100644 --- a/.github/ISSUE_TEMPLATE/source_request.md +++ b/.github/ISSUE_TEMPLATE/source_request.md @@ -9,7 +9,7 @@ labels: "Source Request" I acknowledge that: -- I have updated to the latest version of the app (stable is v0.9.2) +- I have updated to the latest version of the app (stable is v0.10.2) - I have updated all extensions - If this is an issue with the app itself, that I should be opening an issue in https://github.com/inorichi/tachiyomi - I have searched the existing issues for duplicates diff --git a/.travis/create-repo.sh b/.travis/create-repo.sh index 84964f7ca..a26a78199 100755 --- a/.travis/create-repo.sh +++ b/.travis/create-repo.sh @@ -39,6 +39,9 @@ for APK in ${APKS[@]}; do --arg version "$VNAME" \ '{name:$name, pkg:$pkg, apk:$apk, lang:$lang, code:$code, version:$version}' -done | jq -scr '[.[]]' > index.json +done | jq -sr '[.[]]' > index.json + +# Alternate gzipped copy +gzip -c index.json > index.json.gz cat index.json diff --git a/src/all/ehentai/src/eu/kanade/tachiyomi/extension/all/ehentai/EHentai.kt b/src/all/ehentai/src/eu/kanade/tachiyomi/extension/all/ehentai/EHentai.kt index 7572d3175..b2d06e326 100644 --- a/src/all/ehentai/src/eu/kanade/tachiyomi/extension/all/ehentai/EHentai.kt +++ b/src/all/ehentai/src/eu/kanade/tachiyomi/extension/all/ehentai/EHentai.kt @@ -4,6 +4,8 @@ import android.annotation.SuppressLint import android.app.Application import android.content.SharedPreferences import android.net.Uri +import android.support.v7.preference.CheckBoxPreference as LegacyCheckBoxPreference +import android.support.v7.preference.PreferenceScreen as LegacyPreferenceScreen import androidx.preference.CheckBoxPreference import androidx.preference.PreferenceScreen import eu.kanade.tachiyomi.network.GET @@ -22,6 +24,7 @@ import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.util.asJsoup +import java.net.URLEncoder import okhttp3.CacheControl import okhttp3.CookieJar import okhttp3.Headers @@ -31,9 +34,6 @@ import org.jsoup.nodes.Element import rx.Observable import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get -import java.net.URLEncoder -import android.support.v7.preference.CheckBoxPreference as LegacyCheckBoxPreference -import android.support.v7.preference.PreferenceScreen as LegacyPreferenceScreen open class EHentai(override val lang: String, private val ehLang: String) : ConfigurableSource, HttpSource() { diff --git a/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt b/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt index 3d75dfe46..3fcaececb 100644 --- a/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt +++ b/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt @@ -28,6 +28,10 @@ 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.HttpSource +import java.text.DecimalFormat +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale import okhttp3.Credentials import okhttp3.Headers import okhttp3.HttpUrl @@ -39,10 +43,6 @@ import rx.android.schedulers.AndroidSchedulers import rx.schedulers.Schedulers import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get -import java.text.DecimalFormat -import java.text.SimpleDateFormat -import java.util.Date -import java.util.Locale open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() { override fun popularMangaRequest(page: Int): Request = diff --git a/src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/WebtoonsDefault.kt b/src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/WebtoonsDefault.kt index 80231fa63..0f7b29541 100644 --- a/src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/WebtoonsDefault.kt +++ b/src/all/webtoons/src/eu/kanade/tachiyomi/extension/all/webtoons/WebtoonsDefault.kt @@ -6,9 +6,9 @@ import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SManga import java.text.SimpleDateFormat import java.util.Locale +import org.json.JSONObject import org.jsoup.nodes.Document import org.jsoup.nodes.Element -import org.json.JSONObject open class WebtoonsDefault( override val lang: String, @@ -43,11 +43,11 @@ open class WebtoonsDefault( override fun pageListParse(document: Document): List { val pages = document.select("div#_imageList > img").mapIndexed { i, element -> Page(i, "", element.attr("data-url")) } - + if (pages.isNotEmpty()) { return pages } val docString = document.toString() - + val docUrlRegex = Regex("documentURL:.*?'(.*?)'") val motiontoonPathRegex = Regex("jpg:.*?'(.*?)\\{") diff --git a/src/all/wpcomics/src/eu/kanade/tachiyomi/extension/all/wpcomics/WPComics.kt b/src/all/wpcomics/src/eu/kanade/tachiyomi/extension/all/wpcomics/WPComics.kt index 1975c1526..8d48faef5 100644 --- a/src/all/wpcomics/src/eu/kanade/tachiyomi/extension/all/wpcomics/WPComics.kt +++ b/src/all/wpcomics/src/eu/kanade/tachiyomi/extension/all/wpcomics/WPComics.kt @@ -7,14 +7,14 @@ 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 java.text.SimpleDateFormat +import java.util.Calendar +import java.util.Locale import okhttp3.HttpUrl import okhttp3.OkHttpClient import okhttp3.Request import org.jsoup.nodes.Document import org.jsoup.nodes.Element -import java.text.SimpleDateFormat -import java.util.Calendar -import java.util.Locale abstract class WPComics( override val name: String, diff --git a/src/all/wpcomics/src/eu/kanade/tachiyomi/extension/all/wpcomics/WPComicsFactory.kt b/src/all/wpcomics/src/eu/kanade/tachiyomi/extension/all/wpcomics/WPComicsFactory.kt index 7d966025e..a4722fcb9 100644 --- a/src/all/wpcomics/src/eu/kanade/tachiyomi/extension/all/wpcomics/WPComicsFactory.kt +++ b/src/all/wpcomics/src/eu/kanade/tachiyomi/extension/all/wpcomics/WPComicsFactory.kt @@ -110,7 +110,7 @@ private class TruyenChon : WPComics("TruyenChon", "http://truyenchon.com", "vi", } private class ComicLatest : WPComics("ComicLatest", "https://comiclatest.com", "en", SimpleDateFormat("MM/dd/yyyy", Locale.US), null) { - //Hot only has one page + // Hot only has one page override val popularPath = "popular-comics" override fun popularMangaFromElement(element: Element) = SManga.create().apply { @@ -136,7 +136,7 @@ private class ComicLatest : WPComics("ComicLatest", "https://comiclatest.com", " override fun searchMangaSelector() = "div.item div.box_img > a[title]" - //For whatever reason, errors with author search if this isn't overridden + // For whatever reason, errors with author search if this isn't overridden override fun searchMangaFromElement(element: Element): SManga { return SManga.create().apply { title = element.attr("title") @@ -160,7 +160,7 @@ private class ComicLatest : WPComics("ComicLatest", "https://comiclatest.com", " override fun pageListRequest(chapter: SChapter) = GET("$baseUrl${chapter.url}/all", headers) - private class AuthorFilter: Filter.Text("Author") + private class AuthorFilter : Filter.Text("Author") override fun getFilterList() = FilterList( Filter.Header("NOTE: Cannot be used with search"), diff --git a/src/ar/andromedascans/src/eu/kanade/tachiyomi/extension/ar/andromedascans/AndromedaScans.kt b/src/ar/andromedascans/src/eu/kanade/tachiyomi/extension/ar/andromedascans/AndromedaScans.kt index baf9ef7a9..a2b736128 100644 --- a/src/ar/andromedascans/src/eu/kanade/tachiyomi/extension/ar/andromedascans/AndromedaScans.kt +++ b/src/ar/andromedascans/src/eu/kanade/tachiyomi/extension/ar/andromedascans/AndromedaScans.kt @@ -7,15 +7,15 @@ 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 java.text.SimpleDateFormat +import java.util.Locale import okhttp3.MediaType import okhttp3.Request import okhttp3.RequestBody import org.jsoup.nodes.Document import org.jsoup.nodes.Element -import java.text.SimpleDateFormat -import java.util.Locale -class AndromedaScans: ParsedHttpSource() { +class AndromedaScans : ParsedHttpSource() { override val name = "AndromedaScans" override val baseUrl = "https://andromedax.net" diff --git a/src/ar/mangazen/src/eu/kanade/tachiyomi/extension/ar/mangazen/MangaZen.kt b/src/ar/mangazen/src/eu/kanade/tachiyomi/extension/ar/mangazen/MangaZen.kt index f0abd8cc2..4c9a05fa4 100644 --- a/src/ar/mangazen/src/eu/kanade/tachiyomi/extension/ar/mangazen/MangaZen.kt +++ b/src/ar/mangazen/src/eu/kanade/tachiyomi/extension/ar/mangazen/MangaZen.kt @@ -6,12 +6,12 @@ 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 java.text.SimpleDateFormat +import java.util.Locale import org.jsoup.nodes.Document import org.jsoup.nodes.Element -import java.util.Locale -import java.text.SimpleDateFormat -class MangaZen: ParsedHttpSource() { +class MangaZen : ParsedHttpSource() { override val baseUrl = "https://manga-zen.com" diff --git a/src/en/comicastle/src/eu/kanade/tachiyomi/extension/en/comicastle/Comicastle.kt b/src/en/comicastle/src/eu/kanade/tachiyomi/extension/en/comicastle/Comicastle.kt index 2d0f1d1dc..c98d232ec 100644 --- a/src/en/comicastle/src/eu/kanade/tachiyomi/extension/en/comicastle/Comicastle.kt +++ b/src/en/comicastle/src/eu/kanade/tachiyomi/extension/en/comicastle/Comicastle.kt @@ -8,6 +8,9 @@ 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 java.net.URLEncoder +import java.util.Calendar +import java.util.Locale import okhttp3.HttpUrl import okhttp3.MediaType import okhttp3.OkHttpClient @@ -16,9 +19,6 @@ import okhttp3.RequestBody import okhttp3.Response import org.jsoup.nodes.Document import org.jsoup.nodes.Element -import java.net.URLEncoder -import java.util.Calendar -import java.util.Locale class Comicastle : ParsedHttpSource() { diff --git a/src/en/mangafast/src/eu/kanade/tachiyomi/extension/en/mangafast/MangaFast.kt b/src/en/mangafast/src/eu/kanade/tachiyomi/extension/en/mangafast/MangaFast.kt index 554e7bb52..ef8bd8fcc 100644 --- a/src/en/mangafast/src/eu/kanade/tachiyomi/extension/en/mangafast/MangaFast.kt +++ b/src/en/mangafast/src/eu/kanade/tachiyomi/extension/en/mangafast/MangaFast.kt @@ -6,12 +6,12 @@ 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 java.text.SimpleDateFormat +import java.util.Locale import org.jsoup.nodes.Document import org.jsoup.nodes.Element -import java.util.Locale -import java.text.SimpleDateFormat -class MangaFast: ParsedHttpSource() { +class MangaFast : ParsedHttpSource() { override val name = "MangaFast" override val baseUrl = "https://mangafast.net"