wbrawner/Simple-Music-Player
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use folder name as album name

Browse source
This commit is contained in:
Naveen 2023-07-08 15:54:01 +05:30
parent 4b2031cff5
commit 04083347ee
No known key found for this signature in database
GPG key ID: 0E155DAD31671DA3
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/kotlin/com/simplemobiletools/musicplayer/helpers/SimpleMediaScanner.kt
View file

@ -81,13 +81,13 @@ class SimpleMediaScanner(private val context: Application) {
val title = cursor.getStringValue(Files.FileColumns.TITLE)
val duration = cursor.getIntValue(Files.FileColumns.DURATION) / 1000
val path = cursor.getStringValue(Files.FileColumns.DATA)
val artist = cursor.getStringValue(Files.FileColumns.ALBUM_ARTIST) ?: cursor.getStringValue(Files.FileColumns.ARTIST) ?: MediaStore.UNKNOWN_STRING
val album = cursor.getStringValue(Files.FileColumns.ALBUM)
val artist = cursor.getStringValue(Files.FileColumns.ALBUM_ARTIST) ?: cursor.getStringValue(Files.FileColumns.ARTIST) ?: MediaStore.UNKNOWN_STRING
val folderName = if (isQPlus()) {
cursor.getStringValue(Files.FileColumns.BUCKET_DISPLAY_NAME) ?: MediaStore.UNKNOWN_STRING
} else {
""
path.getParentPath().getFilenameFromPath()
}
val album = cursor.getStringValue(Files.FileColumns.ALBUM) ?: folderName
val track = Track(0, id, title, artist, path, duration, album, "", 0, 0, folderName, 0, 0)
track.title = track.getProperTitle(showFilename)
@ -115,13 +115,13 @@ class SimpleMediaScanner(private val context: Application) {
val title = retriever.extractMetadata(METADATA_KEY_TITLE) ?: path.getFilenameFromPath()
val artist = retriever.extractMetadata(METADATA_KEY_ALBUMARTIST) ?: retriever.extractMetadata(METADATA_KEY_ARTIST) ?: MediaStore.UNKNOWN_STRING
val duration = retriever.extractMetadata(METADATA_KEY_DURATION)?.toLong()?.div(1000)?.toInt() ?: 0
val folder = file.parent?.getFilenameFromPath()
val album = retriever.extractMetadata(METADATA_KEY_ALBUM) ?: folder ?: MediaStore.UNKNOWN_STRING
val folderName = file.parent?.getFilenameFromPath()
val album = retriever.extractMetadata(METADATA_KEY_ALBUM) ?: folderName ?: MediaStore.UNKNOWN_STRING
val trackNumber = retriever.extractMetadata(METADATA_KEY_CD_TRACK_NUMBER)
val trackId = trackNumber?.split("/")?.first()?.toInt() ?: 0
if (title.isNotEmpty() && folder != null) {
val track = Track(0, id, title, artist, path, duration, album, "", 0, trackId, folder, 0, 0, FLAG_MANUAL_CACHE)
if (title.isNotEmpty() && folderName != null) {
val track = Track(0, id, title, artist, path, duration, album, "", 0, trackId, folderName, 0, 0, FLAG_MANUAL_CACHE)
allTracks.add(track)
}
}