From d2c54eeb2a395d74cdd2d02ca277d4ad37a0ad1a Mon Sep 17 00:00:00 2001 From: Adrian Ulrich Date: Sun, 22 Jan 2017 21:14:11 +0100 Subject: [PATCH] Do not index ringtone data --- src/ch/blinkenlights/android/medialibrary/MediaScanner.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ch/blinkenlights/android/medialibrary/MediaScanner.java b/src/ch/blinkenlights/android/medialibrary/MediaScanner.java index e251a882..b73a6b7b 100644 --- a/src/ch/blinkenlights/android/medialibrary/MediaScanner.java +++ b/src/ch/blinkenlights/android/medialibrary/MediaScanner.java @@ -513,7 +513,8 @@ public class MediaScanner implements Handler.Callback { return hasChanged; } - private static final Pattern sIgnoredNames = Pattern.compile("^([^\\.]+|.+\\.(jpe?g|gif|png|bmp|webm|txt|pdf|avi|mp4|mkv|zip|tgz|xml))$", Pattern.CASE_INSENSITIVE); + private static final Pattern sIgnoredFilenames = Pattern.compile("^([^\\.]+|.+\\.(jpe?g|gif|png|bmp|webm|txt|pdf|avi|mp4|mkv|zip|tgz|xml))$", Pattern.CASE_INSENSITIVE); + private static final Pattern sIgnoredDirectories = Pattern.compile("^.+/(Android/data|Notifications|Ringtones)/.+$", Pattern.CASE_INSENSITIVE); /** * Returns true if the file should not be scanned * @@ -521,7 +522,8 @@ public class MediaScanner implements Handler.Callback { * @return boolean */ private boolean isBlacklisted(File file) { - return sIgnoredNames.matcher(file.getName()).matches(); + boolean blacklisted = sIgnoredFilenames.matcher(file.getName()).matches() || sIgnoredDirectories.matcher(file.getPath()).matches(); + return blacklisted; }