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

Update Japscan (#16908) 

* Update Japscan.kt

Japscan splitted tables, fast fix for it
Closes #16898

* Remove Log.d messages

---------

Co-authored-by: Rajh <Rajh>
This commit is contained in:
Rajh 2023-07-01 16:07:17 +02:00 committed by GitHub
parent abe6448516
commit a70b186815
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fr/japscan/build.gradle
View File

@ -6,7 +6,7 @@ ext {
extName = 'Japscan' extName = 'Japscan'
pkgNameSuffix = 'fr.japscan' pkgNameSuffix = 'fr.japscan'
extClass = '.Japscan' extClass = '.Japscan'
extVersionCode = 40 extVersionCode = 41
} }
apply from: "$rootDir/common.gradle" apply from: "$rootDir/common.gradle"

34
src/fr/japscan/src/eu/kanade/tachiyomi/extension/fr/japscan/Japscan.kt
View File

@ -261,9 +261,8 @@ class Japscan : ConfigurableSource, ParsedHttpSource() {
} }
} }
private val decodingStringsRe: Regex = Regex("""'([\dA-Z]{62})'""", RegexOption.IGNORE_CASE) private val shortDecodingStringsRe: Regex = Regex("""'([\dA-Z]{2})'""", RegexOption.IGNORE_CASE)
private val longDecodingStringsRe: Regex = Regex("""'([\dA-Z]{20})'""", RegexOption.IGNORE_CASE)
private val sortedLookupString: List<Char> = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz".toCharArray().toList()
override fun pageListParse(document: Document): List<Page> { override fun pageListParse(document: Document): List<Page> {
/* /*
@ -281,16 +280,31 @@ class Japscan : ConfigurableSource, ParsedHttpSource() {
Log.d("japscan", "ZJS at $zjsurl") Log.d("japscan", "ZJS at $zjsurl")
val zjs = client.newCall(GET(baseUrl + zjsurl, headers)).execute().body.string() val zjs = client.newCall(GET(baseUrl + zjsurl, headers)).execute().body.string()
val stringLookupTables = decodingStringsRe.findAll(zjs).mapNotNull { // Japscan split its lookup table into 1 string of 2 chars + 2 * 3 strings of 20 chars
it.groupValues[1].takeIf { // Try to find the 2 set of 3 strings of 20 chars first
it.toCharArray().sorted() == sortedLookupString val rawLongStringLookupTables = longDecodingStringsRe.findAll(zjs).map {
} it.groupValues[1]
}.toList() }.toList()
if (stringLookupTables.size != 2) { if (rawLongStringLookupTables.size != 6) {
throw Exception("Attendait 2 chaînes de recherche dans ZJS, a trouvé ${stringLookupTables.size}") throw Exception("Attendait 6 chaînes de recherche dans ZJS, a trouvé ${rawLongStringLookupTables.size}")
} }
Log.d("japscan", "lookup tables: $stringLookupTables")
// Then try to find the 2 strings of 2 chars (will output 3 values the first is something else)
val rawShortStringLookupTables = shortDecodingStringsRe.findAll(zjs).map {
it.groupValues[1]
}.toList()
if (rawShortStringLookupTables.size != 3) {
throw Exception("Attendait 3 chaînes de recherche dans ZJS, a trouvé ${rawShortStringLookupTables.size}")
}
// Once we found the 8 strings, assuming they are always in the same order
// Since Japscan reverse the char order, reverse the strings
val stringLookupTables = listOf(
rawShortStringLookupTables[1].reversed() + rawLongStringLookupTables[5].reversed() + rawLongStringLookupTables[2].reversed() + rawLongStringLookupTables[0].reversed(),
rawShortStringLookupTables[2].reversed() + rawLongStringLookupTables[3].reversed() + rawLongStringLookupTables[4].reversed() + rawLongStringLookupTables[1].reversed(),
)
val scrambledData = document.getElementById("data")!!.attr("data-data") val scrambledData = document.getElementById("data")!!.attr("data-data")