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

musikr: use correct ext stripping in name

Browse source
This commit is contained in:
Alexander Capehart 2025-03-04 12:26:57 -07:00
parent d9afc6a0eb
commit e434c4cdfe
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
musikr/src/main/java/org/oxycblt/musikr/tag/interpret/TagInterpreter.kt
View file

@ -68,8 +68,7 @@ private class TagInterpreterImpl(private val interpretation: Interpretation) : T
val songNameOrFileWithoutExt = val songNameOrFileWithoutExt =
song.tags.name ?: requireNotNull(song.file.path.name).split('.').first() song.tags.name ?: requireNotNull(song.file.path.name).split('.').first()
val songNameOrFileWithoutExtCorrect = val songNameOrFileWithoutExtCorrect =
song.tags.name song.tags.name ?: requireNotNull(song.file.path.name).substringBeforeLast(".")
?: requireNotNull(song.file.path.name).substringBeforeLast(".")
val albumNameOrDir = song.tags.albumName ?: song.file.path.directory.name val albumNameOrDir = song.tags.albumName ?: song.file.path.directory.name
val musicBrainzId = song.tags.musicBrainzId?.toUuidOrNull() val musicBrainzId = song.tags.musicBrainzId?.toUuidOrNull()
@ -131,7 +130,7 @@ private class TagInterpreterImpl(private val interpretation: Interpretation) : T
modifiedMs = song.file.modifiedMs, modifiedMs = song.file.modifiedMs,
addedMs = song.addedMs, addedMs = song.addedMs,
musicBrainzId = musicBrainzId, musicBrainzId = musicBrainzId,
name = interpretation.naming.name(songNameOrFileWithoutExt, song.tags.sortName), name = interpretation.naming.name(songNameOrFileWithoutExtCorrect, song.tags.sortName),
rawName = songNameOrFileWithoutExtCorrect, rawName = songNameOrFileWithoutExtCorrect,
track = song.tags.track, track = song.tags.track,
disc = song.tags.disc?.let { Disc(it, song.tags.subtitle) }, disc = song.tags.disc?.let { Disc(it, song.tags.subtitle) },