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

Support adding all files from a directory (#1101)

Browse Source 
* Support adding a directory of tracks even if it is not contained in the database (yet)

Currently only single files were handled, but it is useful to also
do this for directories by recursively adding all contained files.

* Limit number of files added to queue to 500
This commit is contained in:
Dominik Stadler 2021-08-21 09:39:31 +02:00 committed by GitHub
parent aedd1f2dae
commit 7c0fdf0957
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
app/src/main/java/ch/blinkenlights/android/vanilla/MediaUtils.java
View File

@ -28,6 +28,7 @@ import ch.blinkenlights.android.medialibrary.MediaMetadataExtractor;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@ -111,6 +112,12 @@ public class MediaUtils {
*/
private static final String FILE_SORT = "path";
/**
* The number of files that are added when "play all" selects
* files from the file-system.
*/
private static final int MAX_QUEUED_FILES = 500;
/**
* Cached random instance.
*/
@ -538,12 +545,28 @@ public class MediaUtils {
}
/**
* Returns a (possibly empty) Cursor for given file path
* Returns a (possibly empty) Cursor for given file path.
*
* For directories, it recursively adds all files contained
* in this directory.
*
* @param path The path to the file to be queried
* @return A new Cursor object
* */
public static Cursor getCursorForFileQuery(String path) {
MatrixCursor matrixCursor = new MatrixCursor(Song.FILLED_PROJECTION);
File directory = new File(path);
if (directory.isDirectory()) {
addDirectoryToCursor(directory, matrixCursor);
} else {
addFileToCursor(path, matrixCursor);
}
return matrixCursor;
}
private static void addFileToCursor(String path, MatrixCursor matrixCursor) {
MediaMetadataExtractor tags = new MediaMetadataExtractor(path);
String title = tags.getFirst(MediaMetadataExtractor.TITLE);
String album = tags.getFirst(MediaMetadataExtractor.ALBUM);
@ -574,8 +597,31 @@ public class MediaUtils {
matrixCursor.addRow(objData);
}
}
return matrixCursor;
private static void addDirectoryToCursor(File directory, MatrixCursor matrixCursor) {
File[] files = directory.listFiles();
if (files == null) {
return;
}
// make sure items are returned in sorted order by the cursor
Arrays.sort(files);
for (File file : files) {
// don't add more files endlessly, but stop after
// the given maximum number of entries
if (matrixCursor.getCount() >= MAX_QUEUED_FILES) {
break;
}
if (file.isDirectory()) {
// recurse into this sub-directory
addDirectoryToCursor(file, matrixCursor);
} else {
addFileToCursor(file.getAbsolutePath(), matrixCursor);
}
}
}
/**