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

musikr: correctly strip extensions from files

Browse source 
Otherwise I can mangle filenames that are just dots.
This commit is contained in:
Alexander Capehart 2025-02-25 09:11:27 -07:00
parent 59c33b9be2
commit ddeba2c496
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -67,6 +67,8 @@ private class TagInterpreterImpl(private val interpretation: Interpretation) : T
val songNameOrFile = song.tags.name ?: requireNotNull(song.file.path.name) val songNameOrFile = song.tags.name ?: requireNotNull(song.file.path.name)
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 =
song.tags.name ?: requireNotNull(song.file.path.name).split('.').dropLast(1).joinToString('.')
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()
@ -114,7 +116,7 @@ private class TagInterpreterImpl(private val interpretation: Interpretation) : T
addedMs = song.addedMs, addedMs = song.addedMs,
musicBrainzId = musicBrainzId, musicBrainzId = musicBrainzId,
name = interpretation.naming.name(songNameOrFileWithoutExt, song.tags.sortName), name = interpretation.naming.name(songNameOrFileWithoutExt, song.tags.sortName),
rawName = songNameOrFileWithoutExt, 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) },
date = song.tags.date, date = song.tags.date,