rebelonion/Dantotsu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

regex fix

Browse source
This commit is contained in:
rebelonion 2024-01-20 22:51:24 -06:00
parent b018d0f090
commit 45a341397b
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -34,7 +34,7 @@ android {
release { release {
manifestPlaceholders = [icon_placeholder: "@mipmap/ic_launcher", icon_placeholder_round: "@mipmap/ic_launcher_round"] manifestPlaceholders = [icon_placeholder: "@mipmap/ic_launcher", icon_placeholder_round: "@mipmap/ic_launcher_round"]
debuggable false debuggable false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-gson.pro', 'proguard-rules.pro'
} }
} }
buildFeatures { buildFeatures {

12
app/src/main/java/ani/dantotsu/media/anime/AnimeNameAdapter.kt
View file

@ -50,17 +50,15 @@ class AnimeNameAdapter {
val removedNumber = text.replace(regexPattern, "").ifEmpty { val removedNumber = text.replace(regexPattern, "").ifEmpty {
text text
} }
return if (removedNumber.equals(text, true)) { // if nothing was removed val letterPattern = Regex("[a-zA-Z]")
val failedEpisodeNumberPattern: Regex = return if (letterPattern.containsMatchIn(removedNumber)) {
Regex(failedEpisodeNumberRegex, RegexOption.IGNORE_CASE)
failedEpisodeNumberPattern.replace(removedNumber) { mr ->
mr.value.replaceFirst(mr.groupValues[1], "")
}.ifEmpty { removedNumber }
} else {
removedNumber removedNumber
} else {
text
} }
} }
fun removeEpisodeNumberCompletely(text: String): String { fun removeEpisodeNumberCompletely(text: String): String {
val regexPattern = Regex(episodeRegex, RegexOption.IGNORE_CASE) val regexPattern = Regex(episodeRegex, RegexOption.IGNORE_CASE)
val removedNumber = text.replace(regexPattern, "") val removedNumber = text.replace(regexPattern, "")

4
app/src/main/java/ani/dantotsu/others/Kitsu.kt
View file

@ -85,10 +85,10 @@ query {
return a return a
} }
fun decodeToString(res: NiceResponse?): String? { private fun decodeToString(res: NiceResponse?): String? {
return when (res?.headers?.get("Content-Encoding")) { return when (res?.headers?.get("Content-Encoding")) {
"gzip" -> { "gzip" -> {
res.body.byteStream()?.use { inputStream -> res.body.byteStream().use { inputStream ->
GZIPInputStream(inputStream).use { gzipInputStream -> GZIPInputStream(inputStream).use { gzipInputStream ->
InputStreamReader(gzipInputStream).use { reader -> InputStreamReader(gzipInputStream).use { reader ->
reader.readText() reader.readText()