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

catch exceptions thrown at getArtist

Browse source
This commit is contained in:
tibbi 2017-05-28 23:41:05 +02:00
parent 51317acb86
commit e74a60038a
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/PropertiesDialog.kt
View file

@ -60,12 +60,12 @@ class PropertiesDialog() {
addProperty(R.string.resolution, file.getResolution().formatAsResolution())
} else if (file.isAudioSlow()) {
file.getDuration()?.let { addProperty(R.string.duration, it) }
addProperty(R.string.artist, file.getArtist())
file.getArtist()?.let { addProperty(R.string.artist, it) }
addProperty(R.string.album, file.getAlbum())
} else if (file.isVideoSlow()) {
file.getDuration()?.let { addProperty(R.string.duration, it) }
addProperty(R.string.resolution, file.getResolution().formatAsResolution())
addProperty(R.string.artist, file.getArtist())
file.getArtist()?.let { addProperty(R.string.artist, it) }
addProperty(R.string.album, file.getAlbum())
}

10
commons/src/main/kotlin/com/simplemobiletools/commons/extensions/File.kt
View file

@ -40,9 +40,13 @@ fun File.getDuration(): String? {
}
fun File.getArtist(): String? {
val retriever = MediaMetadataRetriever()
retriever.setDataSource(absolutePath)
return retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_ARTIST)
try {
val retriever = MediaMetadataRetriever()
retriever.setDataSource(absolutePath)
return retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_ARTIST)
} catch (ignored: Exception) {
return null
}
}
fun File.getAlbum(): String? {