Skip to content

Commit

Permalink
refactor: escapeable tag separators (#723)
Browse files Browse the repository at this point in the history
  • Loading branch information
@zyrouge
zyrouge committed Jan 19, 2025
1 parent 4c9956f commit da58f5c
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 23 deletions.
4 changes: 3 additions & 1 deletion app/src/main/java/io/github/zyrouge/symphony/services/groove/MediaExposer.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ class MediaExposer(private val symphony: Symphony) {
val artworkCacheUnused: ConcurrentSet<String>,
val lyricsCacheUnused: ConcurrentSet<String>,
val filter: MediaFilter,
val songParseOptions: Song.ParseOptions,
) {
companion object {
suspend fun create(symphony: Symphony): ScanCycle {
Expand All @@ -56,6 +57,7 @@ class MediaExposer(private val symphony: Symphony) {
artworkCacheUnused = artworkCacheUnused,
lyricsCacheUnused = lyricsCacheUnused,
filter = filter,
songParseOptions = Song.ParseOptions.create(symphony),
)
}
}
Expand Down Expand Up @@ -128,7 +130,7 @@ class MediaExposer(private val symphony: Symphony) {
&& (cached.coverFile?.let { cycle.artworkCacheUnused.contains(it) } != false)
val song = when {
cacheHit -> cached
else -> Song.parse(symphony, path, file)
else -> Song.parse(path, file, cycle.songParseOptions)
}
if (song.duration.milliseconds < symphony.settings.minSongDuration.value.seconds) {
return
Expand Down
66 changes: 44 additions & 22 deletions app/src/main/java/io/github/zyrouge/symphony/services/groove/Song.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import me.zyrouge.symphony.metaphony.AudioMetadataParser
import java.io.FileOutputStream
import java.math.RoundingMode
import java.time.LocalDate
import java.util.regex.Pattern

@Immutable
@Entity("songs")
Expand Down Expand Up @@ -46,6 +47,20 @@ data class Song(
val uri: Uri,
val path: String,
) {
data class ParseOptions(
val symphony: Symphony,
val artistSeparatorRegex: Regex,
val genreSeparatorRegex: Regex,
) {
companion object {
fun create(symphony: Symphony) = ParseOptions(
symphony = symphony,
artistSeparatorRegex = makeSeparatorsRegex(symphony.settings.artistTagSeparators.value),
genreSeparatorRegex = makeSeparatorsRegex(symphony.settings.genreTagSeparators.value),
)
}
}

val bitrateK: Long? get() = bitrate?.let { it / 1000 }
val samplingRateK: Float?
get() = samplingRate?.let {
Expand Down Expand Up @@ -83,25 +98,30 @@ data class Song(
}

companion object {
fun parse(symphony: Symphony, path: SimplePath, file: DocumentFileX): Song {
if (symphony.settings.useMetaphony.value) {
fun parse(
path: SimplePath,
file: DocumentFileX,
options: ParseOptions,
): Song {
if (options.symphony.settings.useMetaphony.value) {
try {
val song = parseUsingMetaphony(symphony, path, file)
val song = parseUsingMetaphony(path, file, options)
if (song != null) {
return song
}
} catch (err: Exception) {
Logger.error("Song", "could not parse using metaphony", err)
}
}
return parseUsingMediaMetadataRetriever(symphony, path, file)
return parseUsingMediaMetadataRetriever(path, file, options)
}

private fun parseUsingMetaphony(
symphony: Symphony,
path: SimplePath,
file: DocumentFileX,
options: ParseOptions,
): Song? {
val symphony = options.symphony
val metadata = symphony.applicationContext.contentResolver
.openFileDescriptor(file.uri, "r")
?.use { AudioMetadataParser.parse(file.name, it.detachFd()) }
Expand Down Expand Up @@ -134,16 +154,14 @@ data class Song(
metadata.lyrics?.let {
symphony.database.lyricsCache.put(id, it)
}
val artistSeparators = symphony.settings.artistTagSeparators.value
val genreSeparators = symphony.settings.genreTagSeparators.value
return Song(
id = id,
title = metadata.title ?: path.nameWithoutExtension,
album = metadata.album,
artists = parseMultiValue(metadata.artists, artistSeparators),
composers = parseMultiValue(metadata.composers, artistSeparators),
albumArtists = parseMultiValue(metadata.albumArtists, artistSeparators),
genres = parseMultiValue(metadata.genres, genreSeparators),
artists = parseMultiValue(metadata.artists, options.artistSeparatorRegex),
composers = parseMultiValue(metadata.composers, options.artistSeparatorRegex),
albumArtists = parseMultiValue(metadata.albumArtists, options.artistSeparatorRegex),
genres = parseMultiValue(metadata.genres, options.genreSeparatorRegex),
trackNumber = metadata.trackNumber,
trackTotal = metadata.trackTotal,
discNumber = metadata.discNumber,
Expand All @@ -164,10 +182,11 @@ data class Song(
}

fun parseUsingMediaMetadataRetriever(
symphony: Symphony,
path: SimplePath,
file: DocumentFileX,
options: ParseOptions,
): Song {
val symphony = options.symphony
val retriever = MediaMetadataRetriever()
retriever.setDataSource(symphony.applicationContext, file.uri)
val id = symphony.groove.song.idGenerator.next() + ".mr"
Expand Down Expand Up @@ -211,16 +230,14 @@ data class Song(
.extractMetadata(MediaMetadataRetriever.METADATA_KEY_SAMPLERATE)
?.toLongOrNull()
}
val artistSeparators = symphony.settings.artistTagSeparators.value
val genreSeparators = symphony.settings.genreTagSeparators.value
return Song(
id = id,
title = title ?: path.nameWithoutExtension,
album = album,
artists = parseMultiValue(artists, artistSeparators),
composers = parseMultiValue(composers, artistSeparators),
albumArtists = parseMultiValue(albumArtists, artistSeparators),
genres = parseMultiValue(genres, genreSeparators),
artists = parseMultiValue(artists, options.artistSeparatorRegex),
composers = parseMultiValue(composers, options.artistSeparatorRegex),
albumArtists = parseMultiValue(albumArtists, options.artistSeparatorRegex),
genres = parseMultiValue(genres, options.genreSeparatorRegex),
trackNumber = trackNumber,
trackTotal = trackTotal,
discNumber = discNumber,
Expand All @@ -240,14 +257,19 @@ data class Song(
)
}

fun parseMultiValue(value: String?, separators: Set<String>) = value?.let {
parseMultiValue(setOf(it), separators)
private fun makeSeparatorsRegex(separators: Set<String>): Regex {
val partial = separators.joinToString("|") { Pattern.quote(it) }
return Regex("""(?<!\\)($partial)""")
}

fun parseMultiValue(value: String?, regex: Regex) = value?.let {
parseMultiValue(setOf(it), regex)
} ?: emptySet()

fun parseMultiValue(values: Set<String>, separators: Set<String>): Set<String> {
fun parseMultiValue(values: Set<String>, regex: Regex): Set<String> {
val result = mutableSetOf<String>()
for (x in values) {
for (y in x.trim().split(*separators.toTypedArray())) {
for (y in x.trim().split(regex)) {
val trimmed = y.trim()
if (trimmed.isEmpty()) {
continue
Expand Down

0 comments on commit da58f5c

Please sign in to comment.