diff --git a/src/ja/rawdevart/build.gradle b/src/ja/rawdevart/build.gradle new file mode 100644 index 000000000..268947437 --- /dev/null +++ b/src/ja/rawdevart/build.gradle @@ -0,0 +1,12 @@ +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' + +ext { + appName = 'Tachiyomi: Rawdevart' + pkgNameSuffix = 'ja.rawdevart' + extClass = '.Rawdevart' + extVersionCode = 1 + libVersion = '1.2' +} + +apply from: "$rootDir/common.gradle" diff --git a/src/ja/rawdevart/res/mipmap-hdpi/ic_launcher.png b/src/ja/rawdevart/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..dc85536eb Binary files /dev/null and b/src/ja/rawdevart/res/mipmap-hdpi/ic_launcher.png differ diff --git a/src/ja/rawdevart/res/mipmap-mdpi/ic_launcher.png b/src/ja/rawdevart/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..2f3891937 Binary files /dev/null and b/src/ja/rawdevart/res/mipmap-mdpi/ic_launcher.png differ diff --git a/src/ja/rawdevart/res/mipmap-xhdpi/ic_launcher.png b/src/ja/rawdevart/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..d8c8c0008 Binary files /dev/null and b/src/ja/rawdevart/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/src/ja/rawdevart/res/mipmap-xxhdpi/ic_launcher.png b/src/ja/rawdevart/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..2762e913e Binary files /dev/null and b/src/ja/rawdevart/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/src/ja/rawdevart/res/mipmap-xxxhdpi/ic_launcher.png b/src/ja/rawdevart/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..6b09149dd Binary files /dev/null and b/src/ja/rawdevart/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/src/ja/rawdevart/res/web_hi_res_512.png b/src/ja/rawdevart/res/web_hi_res_512.png new file mode 100644 index 000000000..d135b815d Binary files /dev/null and b/src/ja/rawdevart/res/web_hi_res_512.png differ diff --git a/src/ja/rawdevart/src/eu/kanade/tachiyomi/extension/ja/rawdevart/Rawdevart.kt b/src/ja/rawdevart/src/eu/kanade/tachiyomi/extension/ja/rawdevart/Rawdevart.kt new file mode 100644 index 000000000..5565f46de --- /dev/null +++ b/src/ja/rawdevart/src/eu/kanade/tachiyomi/extension/ja/rawdevart/Rawdevart.kt @@ -0,0 +1,339 @@ +package eu.kanade.tachiyomi.extension.ja.rawdevart + +import eu.kanade.tachiyomi.network.GET +import eu.kanade.tachiyomi.source.model.* +import eu.kanade.tachiyomi.source.online.ParsedHttpSource +import eu.kanade.tachiyomi.util.asJsoup +import okhttp3.* +import org.jsoup.nodes.Document +import org.jsoup.nodes.Element +import java.text.SimpleDateFormat +import java.util.* + +class Rawdevart : ParsedHttpSource() { + + override val name = "Rawdevart" + + override val baseUrl = "https://rawdevart.com" + + override val lang = "ja" + + override val supportsLatest = true + + override val client: OkHttpClient = network.cloudflareClient + + override fun latestUpdatesRequest(page: Int) = + GET("$baseUrl/comic/?page=$page&lister=0") + + override fun latestUpdatesSelector() = "div.row div.hovereffect" + + override fun latestUpdatesFromElement(element: Element): SManga { + val manga = SManga.create() + val item = element.select("a.head") + manga.setUrlWithoutDomain(item.attr("href")) + manga.title = item.text() + manga.thumbnail_url = if (element.select("img").attr("data-src").contains("http")) + element.select("img").attr("data-src").replace("\\s".toRegex(), "") else + baseUrl + element.select("img").attr("data-src") + + return manga + } + + override fun latestUpdatesNextPageSelector() = "li.page-item:not(.disabled) a[aria-label=next]" + + override fun popularMangaRequest(page: Int) = + GET("$baseUrl/comic/?page=$page&lister=5") + + override fun popularMangaFromElement(element: Element) = latestUpdatesFromElement(element) + + override fun popularMangaSelector() = latestUpdatesSelector() + + override fun popularMangaNextPageSelector() = latestUpdatesNextPageSelector() + + override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { + val url = HttpUrl.parse("$baseUrl/search/")!!.newBuilder() + url.addQueryParameter("page", page.toString()) + url.addQueryParameter("title", query) + filters.forEach { filter -> + when (filter) { + is AuthorFilter -> { + url.addQueryParameter("author", filter.state) + } + is ArtistFilter -> { + url.addQueryParameter("artist", filter.state) + } + is SortFilter -> { + url.addQueryParameter("lister", filter.toUriPart()) + } + is TypeFilter -> { + val typeToExclude = mutableListOf() + val typeToInclude = mutableListOf() + filter.state.forEach { content -> + if (content.isExcluded()) + typeToExclude.add(content.id) + else if (content.isIncluded()) + typeToInclude.add(content.id) + } + if (typeToExclude.isNotEmpty()) { + url.addQueryParameter("ctype_exc", typeToExclude + .joinToString(",")) + } + if (typeToInclude.isNotEmpty()) { + url.addQueryParameter("ctype_inc", typeToInclude + .joinToString(",")) + } + } + is StatusFilter -> { + val statusToExclude = mutableListOf() + val statusToInclude = mutableListOf() + filter.state.forEach { content -> + if (content.isExcluded()) + statusToExclude.add(content.id) + else if (content.isIncluded()) + statusToInclude.add(content.id) + } + if (statusToExclude.isNotEmpty()) { + url.addQueryParameter("status_exc", statusToExclude + .joinToString(",")) + } + if (statusToInclude.isNotEmpty()) { + url.addQueryParameter("status_inc", statusToInclude + .joinToString(",")) + } + } + is GenreFilter -> { + val genreToExclude = mutableListOf() + val genreToInclude = mutableListOf() + filter.state.forEach { content -> + if (content.isExcluded()) + genreToExclude.add(content.id) + else if (content.isIncluded()) + genreToInclude.add(content.id) + } + if (genreToExclude.isNotEmpty()) { + url.addQueryParameter("genre_exc", genreToExclude + .joinToString(",")) + } + if (genreToInclude.isNotEmpty()) { + url.addQueryParameter("genre_inc", genreToInclude + .joinToString(",")) + } + } + } + } + + return GET(url.build().toString(), headers) + } + + override fun searchMangaSelector() = latestUpdatesSelector() + + override fun searchMangaFromElement(element: Element) = latestUpdatesFromElement(element) + + override fun searchMangaNextPageSelector() = latestUpdatesNextPageSelector() + + override fun mangaDetailsRequest(manga: SManga): Request { + if (manga.url.startsWith("http")) { + return GET(manga.url, headers) + } + return super.mangaDetailsRequest(manga) + } + + override fun mangaDetailsParse(document: Document): SManga { + val infoElement = document.select("div.manga-main") + val manga = SManga.create() + val status = infoElement.select("th:contains(Status) + td").text() + val genres = mutableListOf() + infoElement.select("div.genres a").forEach { element -> + val genre = element.text() + genres.add(genre) + } + manga.title = infoElement.select("h1").text() + manga.author = infoElement.select("th:contains(Author) + td").text() + manga.artist = infoElement.select("th:contains(Artist) + td").text() + manga.status = parseStatus(status) + manga.genre = genres.joinToString(", ") + manga.description = infoElement.select("div.description").text() + .substringAfter("Description ") + manga.thumbnail_url = if (infoElement.select("img.not-lazy").attr("data-src").contains("http")) + infoElement.select("img.not-lazy").attr("data-src") else + baseUrl + infoElement.select("img.not-lazy").attr("data-src") + + return manga + } + + private fun parseStatus(status: String?) = when { + status == null -> SManga.UNKNOWN + status.contains("Ongoing") -> SManga.ONGOING + status.contains("Finished") -> SManga.COMPLETED + else -> SManga.UNKNOWN + } + + override fun chapterListRequest(manga: SManga) = chapterListRequest(manga.url, 1) + + private fun chapterListRequest(mangaUrl: String, page: Int): Request { + return GET("$baseUrl$mangaUrl?page=$page", headers) + } + + override fun chapterListSelector() = "div.list-group-item" + + override fun chapterListParse(response: Response): List { + var document = response.asJsoup() + val chapters = mutableListOf() + var nextPage = 2 + document.select(chapterListSelector()).map { chapters.add(chapterFromElement(it)) } + while (document.select(paginationNextPageSelector).isNotEmpty()) { + val currentPage = document.select("form#filter_form").attr("action") + document = client.newCall(chapterListRequest(currentPage, nextPage)).execute().asJsoup() + document.select(chapterListSelector()).map { chapters.add(chapterFromElement(it)) } + nextPage++ + } + + return chapters + } + + private val paginationNextPageSelector = latestUpdatesNextPageSelector() + + override fun chapterFromElement(element: Element): SChapter { + val chapter = SChapter.create() + chapter.setUrlWithoutDomain(element.select("div.rounded-0 a").attr("href")) + chapter.name = element.select("div.rounded-0 span.text-truncate").text() + chapter.date_upload = element.select("span.mr-2").text().let { + try { + when { + it.contains("ago") -> Date(System.currentTimeMillis() - it.split("\\s".toRegex())[0].toLong() * 60 * 60 * 1000).time + it.contains("Yesterday") -> Date(System.currentTimeMillis() - 24 * 60 * 60 * 1000).time + it.contains(".") -> SimpleDateFormat("MMM. dd, yyyy", Locale.US).parse(it).time + else -> SimpleDateFormat("yyyy-MM-dd", Locale.US).parse(it).time + } + } catch (e: Exception) { + Date(System.currentTimeMillis()).time + } + } + + return chapter + } + + override fun pageListRequest(chapter: SChapter): Request { + if (chapter.url.startsWith("http")) { + return GET(chapter.url, headers) + } + return super.pageListRequest(chapter) + } + + override fun pageListParse(document: Document): List { + val pages = mutableListOf() + val script = document.select("script").html() + val url = script.substringAfter("const pages = [").substringBefore(",]") + .replace(Regex("""["\\]"""), "") + .split(",") + + for (i in 0 until url.size) { + pages.add(Page(i, "", url[i])) + } + + return pages + } + + override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException("Not used") + + private class AuthorFilter : Filter.Text("Author") + + private class ArtistFilter : Filter.Text("Artist") + + private class SortFilter : UriPartFilter("Sort By", arrayOf( + Pair("