diff --git a/musikr/src/main/java/org/oxycblt/musikr/fs/device/DeviceFiles.kt b/musikr/src/main/java/org/oxycblt/musikr/fs/device/DeviceFiles.kt index 1aa776b45..3490ed69f 100644 --- a/musikr/src/main/java/org/oxycblt/musikr/fs/device/DeviceFiles.kt +++ b/musikr/src/main/java/org/oxycblt/musikr/fs/device/DeviceFiles.kt @@ -76,18 +76,19 @@ private class DeviceFilesImpl(private val contentResolver: ContentResolver) : De while (cursor.moveToNext()) { val childId = cursor.getString(childUriIndex) val displayName = cursor.getString(displayNameIndex) - + // Skip hidden files/directories if ignoreHidden is true if (ignoreHidden && displayName.startsWith(".")) { continue } - + val newPath = relativePath.file(displayName) val mimeType = cursor.getString(mimeTypeIndex) if (mimeType == DocumentsContract.Document.MIME_TYPE_DIR) { // This does NOT block the current coroutine. Instead, we will // evaluate this flow in parallel later to maximize throughput. - recursive.add(exploreImpl(contentResolver, rootUri, childId, newPath, ignoreHidden)) + recursive.add( + exploreImpl(contentResolver, rootUri, childId, newPath, ignoreHidden)) } else if (mimeType.startsWith("audio/") && mimeType != "audio/x-mpegurl") { // Immediately emit all files given that it's just an O(1) op. // This also just makes sure the outer flow has a reason to exist diff --git a/musikr/src/main/java/org/oxycblt/musikr/tag/interpret/TagInterpreter.kt b/musikr/src/main/java/org/oxycblt/musikr/tag/interpret/TagInterpreter.kt index 4f1a803ae..b49d4b378 100644 --- a/musikr/src/main/java/org/oxycblt/musikr/tag/interpret/TagInterpreter.kt +++ b/musikr/src/main/java/org/oxycblt/musikr/tag/interpret/TagInterpreter.kt @@ -68,7 +68,8 @@ private class TagInterpreterImpl(private val interpretation: Interpretation) : T val songNameOrFileWithoutExt = song.tags.name ?: requireNotNull(song.file.path.name).split('.').first() val songNameOrFileWithoutExtCorrect = - song.tags.name ?: requireNotNull(song.file.path.name).split('.').dropLast(1).joinToString('.') + song.tags.name + ?: requireNotNull(song.file.path.name).split('.').dropLast(1).joinToString(".") val albumNameOrDir = song.tags.albumName ?: song.file.path.directory.name val musicBrainzId = song.tags.musicBrainzId?.toUuidOrNull()