mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2025-01-22 23:17:00 +00:00
Code Issues Releases Wiki Activity

MediaBrowser: expose search history

Browse Source
This commit is contained in:
Haggai Eran 2023-02-04 18:09:52 +02:00 committed by Siddhesh Naik
parent 2d6a99cab3
commit b4ce7028d1
1 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
app/src/main/java/org/schabi/newpipe/player/mediabrowser/MediaBrowserConnector.java
View File

@ -23,6 +23,7 @@ import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector;
import org.schabi.newpipe.NewPipeDatabase; import org.schabi.newpipe.NewPipeDatabase;
import org.schabi.newpipe.R; import org.schabi.newpipe.R;
import org.schabi.newpipe.database.AppDatabase; import org.schabi.newpipe.database.AppDatabase;
import org.schabi.newpipe.database.history.model.StreamHistoryEntry;
import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry; import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
import org.schabi.newpipe.database.playlist.PlaylistStreamEntry; import org.schabi.newpipe.database.playlist.PlaylistStreamEntry;
import org.schabi.newpipe.local.playlist.LocalPlaylistManager; import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
@ -72,6 +73,10 @@ public class MediaBrowserConnector implements MediaSessionConnector.PlaybackPrep
private static final String ID_ROOT = "//${BuildConfig.APPLICATION_ID}/r"; private static final String ID_ROOT = "//${BuildConfig.APPLICATION_ID}/r";
@NonNull @NonNull
private static final String ID_BOOKMARKS = ID_ROOT + "/playlists"; private static final String ID_BOOKMARKS = ID_ROOT + "/playlists";
@NonNull
private static final String ID_HISTORY = ID_ROOT + "/history";
@NonNull
private static final String ID_STREAM = ID_ROOT + "/stream";
private MediaItem createRootMediaItem(final String mediaId, final String folderName) { private MediaItem createRootMediaItem(final String mediaId, final String folderName) {
final var builder = new MediaDescriptionCompat.Builder(); final var builder = new MediaDescriptionCompat.Builder();
@ -141,7 +146,9 @@ public class MediaBrowserConnector implements MediaSessionConnector.PlaybackPrep
mediaItems.add( mediaItems.add(
createRootMediaItem(ID_BOOKMARKS, createRootMediaItem(ID_BOOKMARKS,
playerService.getResources().getString(R.string.tab_bookmarks))); playerService.getResources().getString(R.string.tab_bookmarks)));
mediaItems.add(
createRootMediaItem(ID_HISTORY,
playerService.getResources().getString(R.string.action_history)));
} else if (parentId.startsWith(ID_BOOKMARKS)) { } else if (parentId.startsWith(ID_BOOKMARKS)) {
final var path = parentIdUri.getPathSegments(); final var path = parentIdUri.getPathSegments();
if (path.size() == 2) { if (path.size() == 2) {
@ -152,16 +159,38 @@ public class MediaBrowserConnector implements MediaSessionConnector.PlaybackPrep
} else { } else {
Log.w(TAG, "Unknown playlist uri " + parentId); Log.w(TAG, "Unknown playlist uri " + parentId);
} }
} else if (parentId.equals(ID_HISTORY)) {
return populateHistory();
} }
return Single.just(mediaItems); return Single.just(mediaItems);
} }
private LocalPlaylistManager getPlaylistManager() { private Single<List<MediaItem>> populateHistory() {
final var streamHistory = getDatabase().streamHistoryDAO();
final var history = streamHistory.getHistory().firstOrError();
return history.map(items ->
items.stream().map(this::createHistoryMediaItem).collect(Collectors.toList()));
}
private MediaItem createHistoryMediaItem(@NonNull final StreamHistoryEntry streamHistoryEntry) {
final var builder = new MediaDescriptionCompat.Builder();
builder.setMediaId(ID_STREAM + '/' + streamHistoryEntry.getStreamId())
.setTitle(streamHistoryEntry.getStreamEntity().getTitle())
.setIconUri(Uri.parse(streamHistoryEntry.getStreamEntity().getThumbnailUrl()));
return new MediaItem(builder.build(), MediaItem.FLAG_PLAYABLE);
}
private AppDatabase getDatabase() {
if (database == null) { if (database == null) {
database = NewPipeDatabase.getInstance(playerService); database = NewPipeDatabase.getInstance(playerService);
} }
return database;
}
private LocalPlaylistManager getPlaylistManager() {
if (localPlaylistManager == null) { if (localPlaylistManager == null) {
localPlaylistManager = new LocalPlaylistManager(database); localPlaylistManager = new LocalPlaylistManager(getDatabase());
} }
return localPlaylistManager; return localPlaylistManager;
} }
@ -211,6 +240,20 @@ public class MediaBrowserConnector implements MediaSessionConnector.PlaybackPrep
return new SinglePlayQueue(infoItems, index); return new SinglePlayQueue(infoItems, index);
}); });
} }
} else if (mediaId.startsWith(ID_STREAM)) {
final var path = mediaIdUri.getPathSegments();
if (path.size() == 3) {
final long streamId = Long.parseLong(path.get(2));
return getDatabase().streamHistoryDAO().getHistory()
.firstOrError()
.map(items -> {
final var infoItems = items.stream()
.filter(it -> it.getStreamId() == streamId)
.map(StreamHistoryEntry::toStreamInfoItem)
.collect(Collectors.toList());
return new SinglePlayQueue(infoItems, 0);
});
}
} }
return Single.error(new NullPointerException()); return Single.error(new NullPointerException());