norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Fix MediaScanner incorrectly handling empty/whitespace title/album/artist/disc number (#886)

Browse Source 
* Fixed media scanner not correctly handling empty or whitespace title/album/artist/disc number.

* Moved string unset check to function.
This commit is contained in:
Jitnaught 2018-12-28 02:14:55 -07:00 committed by Adrian Ulrich
parent 92a23a09d5
commit e6df2ed2ba
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/ch/blinkenlights/android/medialibrary/MediaScanner.java
View File

@ -448,6 +448,17 @@ public class MediaScanner implements Handler.Callback {
}
}
/**
* Checks if a string is null, empty or whitespace.
*
* @param s the string to check
* @return true if null, empty or whitespace
*/
private static boolean isUnset(String s) {
return s == null || s.trim().isEmpty();
}
/**
* Inspects a single file and adds it to the database or removes it. maybe.
*
@ -500,19 +511,19 @@ public class MediaScanner implements Handler.Callback {
// Get tags which always must be set
String title = tags.getFirst(MediaMetadataExtractor.TITLE);
if (title == null)
if (isUnset(title))
title = file.getName();
String album = tags.getFirst(MediaMetadataExtractor.ALBUM);
if (album == null)
if (isUnset(album))
album = "<No Album>";
String artist = tags.getFirst(MediaMetadataExtractor.ARTIST);
if (artist == null)
if (isUnset(artist))
artist = "<No Artist>";
String discNumber = tags.getFirst(MediaMetadataExtractor.DISC_NUMBER);
if (discNumber == null)
if (isUnset(discNumber))
discNumber = "1"; // untagged, but most likely '1' - this prevents annoying sorting issues with partially tagged files
long artistId = MediaLibrary.hash63(artist);