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

add the album title to song model

Browse source
This commit is contained in:
tibbi 2018-02-05 20:15:14 +01:00
parent f72adc8ea6
commit b9d4bb2cc3
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -230,7 +230,12 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
private fun getSongsFromPaths(paths: List<String>): ArrayList<Song> {
val uri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI
val columns = arrayOf(MediaStore.Audio.Media._ID, MediaStore.Audio.Media.TITLE, MediaStore.Audio.Media.ARTIST, MediaStore.Audio.Media.DATA, MediaStore.Audio.Media.DURATION)
val columns = arrayOf(MediaStore.Audio.Media._ID,
MediaStore.Audio.Media.TITLE,
MediaStore.Audio.Media.ARTIST,
MediaStore.Audio.Media.DATA,
MediaStore.Audio.Media.DURATION,
MediaStore.Audio.Media.ALBUM)
val pathsMap = HashSet<String>()
paths.mapTo(pathsMap, { it })
@ -247,14 +252,15 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
var cursor: Cursor? = null
try {
cursor = context.contentResolver.query(uri, columns, selection, selectionArgs, null)
if (cursor != null && cursor.moveToFirst()) {
if (cursor?.moveToFirst() == true) {
do {
val id = cursor.getLongValue(MediaStore.Audio.Media._ID)
val title = cursor.getStringValue(MediaStore.Audio.Media.TITLE)
val artist = cursor.getStringValue(MediaStore.Audio.Media.ARTIST)
val path = cursor.getStringValue(MediaStore.Audio.Media.DATA)
val duration = cursor.getIntValue(MediaStore.Audio.Media.DURATION) / 1000
val song = Song(id, title, artist, path, duration)
val album = cursor.getStringValue(MediaStore.Audio.Media.ALBUM)
val song = Song(id, title, artist, path, duration, album)
songs.add(song)
pathsMap.remove(path)
} while (cursor.moveToNext())
@ -267,7 +273,7 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
pathsMap.forEach {
val file = File(it)
val unknown = context.getString(R.string.unknown)
val song = Song(0, file.getSongTitle() ?: unknown, file.getArtist() ?: unknown, it, file.getDurationSeconds())
val song = Song(0, file.getSongTitle() ?: unknown, file.getArtist() ?: unknown, it, file.getDurationSeconds(), "")
songs.add(song)
}

2
app/src/main/kotlin/com/simplemobiletools/musicplayer/models/Song.kt
View file

@ -7,7 +7,7 @@ import com.simplemobiletools.musicplayer.helpers.SORT_BY_PATH
import com.simplemobiletools.musicplayer.helpers.SORT_BY_TITLE
import java.io.Serializable
data class Song(val id: Long, var title: String, var artist: String, var path: String, val duration: Int) : Serializable, Comparable<Song> {
data class Song(val id: Long, var title: String, var artist: String, var path: String, val duration: Int, val album: String) : Serializable, Comparable<Song> {
companion object {
private const val serialVersionUID = 6717978793256842245L
var sorting: Int = 0

3
app/src/main/kotlin/com/simplemobiletools/musicplayer/services/MusicService.kt
View file

@ -359,8 +359,9 @@ class MusicService : Service(), MediaPlayer.OnPreparedListener, MediaPlayer.OnEr
if (rawArt != null) {
val options = BitmapFactory.Options()
val bitmap = BitmapFactory.decodeByteArray(rawArt, 0, rawArt.size, options)
if (bitmap != null)
if (bitmap != null) {
return bitmap
}
}
} catch (e: Exception) {
}