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

Relax native verify

Browse Source 
- up MTP observer delay by 2 seconds
- Take up to 100 sec. old files into account if we missed one for whatever reason.
This commit is contained in:
Adrian Ulrich 2018-03-11 11:11:17 +01:00
parent f9e751ea4e
commit e1fd33e7b8
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,8 +81,18 @@ public class MediaScanner implements Handler.Callback {
* The id we are using for the scan notification * The id we are using for the scan notification
*/ */
private static final int NOTIFICATION_ID = 56162; private static final int NOTIFICATION_ID = 56162;
/**
* The notification channel to use
*/
private static final String NOTIFICATION_CHANNEL = "Scanner"; private static final String NOTIFICATION_CHANNEL = "Scanner";
/**
* Relax mtime check while searching for native modifications by this many seconds
*/
private static final int NATIVE_VRFY_MTIME_SLACK = 100;
/**
* Delay native scans by this many ms to coalesce multiple modifications
*/
private static final int NATIVE_VRFY_COALESCE_DELAY = 3500;
MediaScanner(Context context, MediaLibraryBackend backend) { MediaScanner(Context context, MediaLibraryBackend backend) {
mContext = context; mContext = context;
@ -98,7 +108,7 @@ public class MediaScanner implements Handler.Callback {
ContentObserver mObserver = new ContentObserver(null) { ContentObserver mObserver = new ContentObserver(null) {
@Override @Override
public void onChange(boolean self) { public void onChange(boolean self) {
startQuickScan(1500); startQuickScan(NATIVE_VRFY_COALESCE_DELAY);
} }
}; };
context.getContentResolver().registerContentObserver(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, false, mObserver); context.getContentResolver().registerContentObserver(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, false, mObserver);
@ -353,7 +363,7 @@ public class MediaScanner implements Handler.Callback {
private void rpcNativeVerify(Cursor cursor, int mtime) { private void rpcNativeVerify(Cursor cursor, int mtime) {
if (cursor == null) { if (cursor == null) {
mtime = MediaLibrary.getPreferences(mContext)._nativeLastMtime; // starting a new scan -> read stored mtime from preferences mtime = MediaLibrary.getPreferences(mContext)._nativeLastMtime; // starting a new scan -> read stored mtime from preferences
String selection = MediaStore.Audio.Media.IS_MUSIC + "!= 0 AND "+ MediaStore.MediaColumns.DATE_MODIFIED +" > " + mtime; String selection = MediaStore.Audio.Media.IS_MUSIC + "!= 0 AND "+ MediaStore.MediaColumns.DATE_MODIFIED +" > " + (mtime - NATIVE_VRFY_MTIME_SLACK);
String sort = MediaStore.MediaColumns.DATE_MODIFIED; String sort = MediaStore.MediaColumns.DATE_MODIFIED;
String[] projection = { MediaStore.MediaColumns.DATA, MediaStore.MediaColumns.DATE_MODIFIED }; String[] projection = { MediaStore.MediaColumns.DATA, MediaStore.MediaColumns.DATE_MODIFIED };
try { try {