Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Strip symbols and forget thousands separator

Browse source
This commit is contained in:
Chris Palmeri 2023-04-12 23:33:16 -05:00
parent 7d8cdba6a9
commit b34462340a
No known key found for this signature in database
GPG key ID: D9D1B9464F43E5B1
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/org/oxycblt/auxio/music/Music.kt
View file

@ -355,6 +355,9 @@ class SortName(name: String, musicSettings: MusicSettings) : Comparable<SortName
init { init {
var sortName = name var sortName = name
if (musicSettings.intelligentSorting) { if (musicSettings.intelligentSorting) {
// Strip any quotes, dots, and open parentheses from the beginning
sortName = sortName.replace(Regex("""^['".(]+"""), "")
sortName = sortName =
sortName.run { sortName.run {
when { when {
@ -365,16 +368,8 @@ class SortName(name: String, musicSettings: MusicSettings) : Comparable<SortName
} }
} }
// TODO: replace starting ' " ... ( // Zero pad all numbers to (an arbitrary) five digits for better sorting
sortName = sortName.replace(Regex("""\d+""")) { it.value.padStart(5, '0') }
// Zero pad the first number to (an arbitrary) five digits for better sorting
// Will also accept commas in between digits and strip them
sortName =
sortName.replace("""(\d+[\d,]+\d+|\d+)(.*)""".toRegex()) {
val (firstNumber, remainingText) = it.destructured
val onlyDigits = firstNumber.filter { c -> c.isDigit() }
onlyDigits.padStart(5, '0') + remainingText
}
} }
collationKey = COLLATOR.getCollationKey(sortName) collationKey = COLLATOR.getCollationKey(sortName)