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

LANraragi: Safer tag parsing. (#5490)

Browse Source 
It was possible to get a null into the function and the following split() did not like it.
This commit is contained in:
RePod 2021-01-19 17:42:23 -05:00 committed by GitHub
parent bb884dfee1
commit 19adc29d1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/all/lanraragi/build.gradle
View File

@ -5,7 +5,7 @@ ext {
extName = 'LANraragi'
pkgNameSuffix = 'all.lanraragi'
extClass = '.LANraragi'
extVersionCode = 3
extVersionCode = 4
libVersion = '1.2'
}

29
src/all/lanraragi/src/eu/kanade/tachiyomi/extension/all/lanraragi/LANraragi.kt
View File

@ -430,26 +430,29 @@ open class LANraragi : ConfigurableSource, HttpSource() {
return getTopResponse(response).request().url().queryParameter("start")!!.toInt()
}
private fun getArtist(tags: String): String {
tags.split(',').forEach {
private fun getNSTag(tags: String?, tag: String): List<String>? {
tags?.split(',')?.forEach {
if (it.contains(':')) {
val temp = it.trim().split(':')
if (temp[0].equals("artist", true)) return temp[1]
val temp = it.trim().split(":", limit = 2)
if (temp[0].equals(tag, true)) return temp
}
}
return null
}
private fun getArtist(tags: String?): String {
getNSTag(tags, "artist")?.let {
return it[1]
}
return "N/A"
}
private fun getDateAdded(tags: String): String {
tags.split(',').forEach {
if (it.contains(':')) {
val temp = it.trim().split(':')
// Pad Date Added LRR plugin (or user specified namespace) to milliseconds
if (temp[0].equals(latestNamespacePref, true)) return temp[1].padEnd(13, '0')
}
private fun getDateAdded(tags: String?): String {
getNSTag(tags, "date_added")?.let {
// Pad Date Added NS to milliseconds
return it[1].padEnd(13, '0')
}
return ""