Skip to content
This repository was archived by the owner on Feb 4, 2023. It is now read-only.
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions app/src/main/java/com/kabouzeid/gramophone/loader/SongLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.kabouzeid.gramophone.provider.BlacklistStore;
import com.kabouzeid.gramophone.util.PreferenceUtil;

import java.io.File;
import java.util.ArrayList;

/**
Expand Down Expand Up @@ -56,7 +57,10 @@ public static ArrayList<Song> getSongs(@Nullable final Cursor cursor) {
ArrayList<Song> songs = new ArrayList<>();
if (cursor != null && cursor.moveToFirst()) {
do {
songs.add(getSongFromCursorImpl(cursor));
Song song = getSongFromCursorImpl(cursor);
if (song != Song.EMPTY_SONG) {
songs.add(song);
}
} while (cursor.moveToNext());
}

Expand All @@ -81,12 +85,17 @@ public static Song getSong(@Nullable Cursor cursor) {

@NonNull
private static Song getSongFromCursorImpl(@NonNull Cursor cursor) {
final String data = cursor.getString(5);

if (!new File(data).exists()) {
return Song.EMPTY_SONG;
}

final int id = cursor.getInt(0);
final String title = cursor.getString(1);
final int trackNumber = cursor.getInt(2);
final int year = cursor.getInt(3);
final long duration = cursor.getLong(4);
final String data = cursor.getString(5);
final long dateModified = cursor.getLong(6);
final int albumId = cursor.getInt(7);
final String albumName = cursor.getString(8);
Expand Down