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

Update SS to their new domain (#17354) 

Update SS to their new domain.
This commit is contained in:
Alessandro Jean 2023-08-02 15:23:53 -03:00 committed by GitHub
parent 2f1cae5bbf
commit 12d8c314d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pt/saikaiscan/build.gradle
View File

@ -6,7 +6,7 @@ ext {
extName = 'Saikai Scan' extName = 'Saikai Scan'
pkgNameSuffix = 'pt.saikaiscan' pkgNameSuffix = 'pt.saikaiscan'
extClass = '.SaikaiScan' extClass = '.SaikaiScan'
extVersionCode = 10 extVersionCode = 11
} }
apply from: "$rootDir/common.gradle" apply from: "$rootDir/common.gradle"

23
src/pt/saikaiscan/src/eu/kanade/tachiyomi/extension/pt/saikaiscan/SaikaiScan.kt
View File

@ -22,7 +22,7 @@ class SaikaiScan : HttpSource() {
override val name = SOURCE_NAME override val name = SOURCE_NAME
override val baseUrl = "https://saikai.com.br" override val baseUrl = "https://saikaiscans.net"
override val lang = "pt-BR" override val lang = "pt-BR"
@ -51,7 +51,7 @@ class SaikaiScan : HttpSource() {
.addQueryParameter("page", page.toString()) .addQueryParameter("page", page.toString())
.addQueryParameter("per_page", PER_PAGE) .addQueryParameter("per_page", PER_PAGE)
.addQueryParameter("relationships", "language,type,format") .addQueryParameter("relationships", "language,type,format")
.toString() .build()
return GET(apiEndpointUrl, apiHeaders) return GET(apiEndpointUrl, apiHeaders)
} }
@ -60,9 +60,8 @@ class SaikaiScan : HttpSource() {
val result = response.parseAs<SaikaiScanPaginatedStoriesDto>() val result = response.parseAs<SaikaiScanPaginatedStoriesDto>()
val mangaList = result.data!!.map(SaikaiScanStoryDto::toSManga) val mangaList = result.data!!.map(SaikaiScanStoryDto::toSManga)
val hasNextPage = result.meta!!.currentPage < result.meta.lastPage
return MangasPage(mangaList, hasNextPage) return MangasPage(mangaList, result.hasNextPage)
} }
override fun latestUpdatesRequest(page: Int): Request { override fun latestUpdatesRequest(page: Int): Request {
@ -75,7 +74,7 @@ class SaikaiScan : HttpSource() {
.addQueryParameter("page", page.toString()) .addQueryParameter("page", page.toString())
.addQueryParameter("per_page", PER_PAGE) .addQueryParameter("per_page", PER_PAGE)
.addQueryParameter("relationships", "language,type,format,latestReleases.separator") .addQueryParameter("relationships", "language,type,format,latestReleases.separator")
.toString() .build()
return GET(apiEndpointUrl, apiHeaders) return GET(apiEndpointUrl, apiHeaders)
} }
@ -99,7 +98,7 @@ class SaikaiScan : HttpSource() {
filters.filterIsInstance<UrlQueryFilter>() filters.filterIsInstance<UrlQueryFilter>()
.forEach { it.addQueryParameter(apiEndpointUrl) } .forEach { it.addQueryParameter(apiEndpointUrl) }
return GET(apiEndpointUrl.toString(), apiHeaders) return GET(apiEndpointUrl.build(), apiHeaders)
} }
override fun searchMangaParse(response: Response): MangasPage = popularMangaParse(response) override fun searchMangaParse(response: Response): MangasPage = popularMangaParse(response)
@ -118,7 +117,7 @@ class SaikaiScan : HttpSource() {
.addQueryParameter("slug", storySlug) .addQueryParameter("slug", storySlug)
.addQueryParameter("per_page", "1") .addQueryParameter("per_page", "1")
.addQueryParameter("relationships", "language,type,format,artists,status") .addQueryParameter("relationships", "language,type,format,artists,status")
.toString() .build()
return GET(apiEndpointUrl, apiHeaders) return GET(apiEndpointUrl, apiHeaders)
} }
@ -141,7 +140,7 @@ class SaikaiScan : HttpSource() {
.addQueryParameter("slug", storySlug) .addQueryParameter("slug", storySlug)
.addQueryParameter("per_page", "1") .addQueryParameter("per_page", "1")
.addQueryParameter("relationships", "releases") .addQueryParameter("relationships", "releases")
.toString() .build()
return GET(apiEndpointUrl, apiHeaders) return GET(apiEndpointUrl, apiHeaders)
} }
@ -169,7 +168,7 @@ class SaikaiScan : HttpSource() {
val apiEndpointUrl = "$API_URL/api/releases/$releaseId".toHttpUrl().newBuilder() val apiEndpointUrl = "$API_URL/api/releases/$releaseId".toHttpUrl().newBuilder()
.addQueryParameter("relationships", "releaseImages") .addQueryParameter("relationships", "releaseImages")
.toString() .build()
return GET(apiEndpointUrl, apiHeaders) return GET(apiEndpointUrl, apiHeaders)
} }
@ -177,7 +176,7 @@ class SaikaiScan : HttpSource() {
override fun pageListParse(response: Response): List<Page> { override fun pageListParse(response: Response): List<Page> {
val result = response.parseAs<SaikaiScanReleaseResultDto>() val result = response.parseAs<SaikaiScanReleaseResultDto>()
return result.data!!.releaseImages.mapIndexed { i, obj -> return result.data?.releaseImages.orEmpty().mapIndexed { i, obj ->
Page(i, "", "$IMAGE_SERVER_URL/${obj.image}") Page(i, "", "$IMAGE_SERVER_URL/${obj.image}")
} }
} }
@ -295,7 +294,7 @@ class SaikaiScan : HttpSource() {
private const val COMIC_FORMAT_ID = "2" private const val COMIC_FORMAT_ID = "2"
private const val PER_PAGE = "12" private const val PER_PAGE = "12"
private const val API_URL = "https://api.saikai.com.br" private const val API_URL = "https://api.saikaiscans.net"
const val IMAGE_SERVER_URL = "https://s3-alpha.saikai.com.br" const val IMAGE_SERVER_URL = "https://s3-alpha.saikaiscans.net"
} }
} }

6
src/pt/saikaiscan/src/eu/kanade/tachiyomi/extension/pt/saikaiscan/SaikaiScanDto.kt
View File

@ -12,7 +12,11 @@ import java.util.Locale
data class SaikaiScanResultDto<T>( data class SaikaiScanResultDto<T>(
val data: T? = null, val data: T? = null,
val meta: SaikaiScanMetaDto? = null, val meta: SaikaiScanMetaDto? = null,
) ) {
val hasNextPage: Boolean
get() = meta !== null && meta.currentPage < meta.lastPage
}
typealias SaikaiScanPaginatedStoriesDto = SaikaiScanResultDto<List<SaikaiScanStoryDto>> typealias SaikaiScanPaginatedStoriesDto = SaikaiScanResultDto<List<SaikaiScanStoryDto>>
typealias SaikaiScanReleaseResultDto = SaikaiScanResultDto<SaikaiScanReleaseDto> typealias SaikaiScanReleaseResultDto = SaikaiScanResultDto<SaikaiScanReleaseDto>