antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2026-01-01 18:03:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Saved in database downloaded playlists

Browse source
This commit is contained in:
CappielloAntonio 2022-01-02 15:50:59 +01:00
parent b41e3e641b
commit d2ad0188b7
6 changed files with 16 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/cappielloantonio/play/service/DownloaderTracker.java
View file

@ -67,6 +67,11 @@ public class DownloaderTracker {
return DownloadHelper.forMediaItem(context, mediaItem).getDownloadRequest(Util.getUtf8Bytes(checkNotNull(mediaItem.mediaId))); return DownloadHelper.forMediaItem(context, mediaItem).getDownloadRequest(Util.getUtf8Bytes(checkNotNull(mediaItem.mediaId)));
} }
public boolean isDownloaded(Uri uri) {
@Nullable Download download = downloads.get(uri);
return download != null && download.state != Download.STATE_FAILED;
}
@SuppressLint("UnsafeOptInUsageError") @SuppressLint("UnsafeOptInUsageError")
public boolean isDownloaded(MediaItem mediaItem) { public boolean isDownloaded(MediaItem mediaItem) {
@Nullable Download download = downloads.get(checkNotNull(mediaItem.localConfiguration).uri); @Nullable Download download = downloads.get(checkNotNull(mediaItem.localConfiguration).uri);

2
app/src/main/java/com/cappielloantonio/play/ui/dialog/StarredSyncDialog.java
View file

@ -65,7 +65,7 @@ public class StarredSyncDialog extends DialogFragment {
if (songs != null) { if (songs != null) {
DownloadUtil.getDownloadTracker(context).download( DownloadUtil.getDownloadTracker(context).download(
MappingUtil.mapMediaItems(context, songs, false), MappingUtil.mapMediaItems(context, songs, false),
MappingUtil.mapDownload(songs) MappingUtil.mapDownload(songs, null, null)
); );
} }
}); });

2
app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java
View file

@ -110,7 +110,7 @@ public class AlbumPageFragment extends Fragment {
if (isVisible() && getActivity() != null) { if (isVisible() && getActivity() != null) {
DownloadUtil.getDownloadTracker(requireContext()).download( DownloadUtil.getDownloadTracker(requireContext()).download(
MappingUtil.mapMediaItems(requireContext(), songs, false), MappingUtil.mapMediaItems(requireContext(), songs, false),
MappingUtil.mapDownload(songs) MappingUtil.mapDownload(songs, null, null)
); );
} }
}); });

8
app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistPageFragment.java
View file

@ -107,12 +107,8 @@ public class PlaylistPageFragment extends Fragment {
playlistPageViewModel.getPlaylistSongLiveList(requireActivity()).observe(requireActivity(), songs -> { playlistPageViewModel.getPlaylistSongLiveList(requireActivity()).observe(requireActivity(), songs -> {
if (isVisible() && getActivity() != null) { if (isVisible() && getActivity() != null) {
DownloadUtil.getDownloadTracker(requireContext()).download( DownloadUtil.getDownloadTracker(requireContext()).download(
MappingUtil.markPlaylistMediaItems( MappingUtil.mapMediaItems(requireContext(), songs, false),
MappingUtil.mapMediaItems(requireContext(), songs, false), MappingUtil.mapDownload(songs, playlistPageViewModel.getPlaylist().getId(), playlistPageViewModel.getPlaylist().getName())
playlistPageViewModel.getPlaylist().getId(),
playlistPageViewModel.getPlaylist().getName()
),
MappingUtil.mapDownload(songs)
); );
} }
}); });

2
app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java
View file

@ -158,7 +158,7 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements
albumBottomSheetViewModel.getAlbumTracks().observe(requireActivity(), songs -> { albumBottomSheetViewModel.getAlbumTracks().observe(requireActivity(), songs -> {
List<MediaItem> mediaItems = MappingUtil.mapMediaItems(requireContext(), songs, false); List<MediaItem> mediaItems = MappingUtil.mapMediaItems(requireContext(), songs, false);
List<Download> downloads = MappingUtil.mapDownload(songs); List<Download> downloads = MappingUtil.mapDownload(songs, null, null);
downloadAll.setOnClickListener(v -> { downloadAll.setOnClickListener(v -> {
DownloadUtil.getDownloadTracker(requireContext()).download(mediaItems, downloads); DownloadUtil.getDownloadTracker(requireContext()).download(mediaItems, downloads);

29
app/src/main/java/com/cappielloantonio/play/util/MappingUtil.java
View file

@ -173,11 +173,11 @@ public class MappingUtil {
return playlists; return playlists;
} }
public static ArrayList<Download> mapDownload(List<Song> songs) { public static ArrayList<Download> mapDownload(List<Song> songs, String playlistId, String playlistName) {
ArrayList<Download> downloads = new ArrayList(); ArrayList<Download> downloads = new ArrayList();
for (Song song : songs) { for (Song song : songs) {
downloads.add(new Download(song, null, null)); downloads.add(new Download(song, playlistId, playlistName));
} }
return downloads; return downloads;
@ -198,6 +198,8 @@ public class MappingUtil {
} }
public static MediaItem mapMediaItem(Context context, Song song, boolean stream) { public static MediaItem mapMediaItem(Context context, Song song, boolean stream) {
boolean isDownloaded = DownloadUtil.getDownloadTracker(context).isDownloaded(MusicUtil.getSongDownloadUri(song));
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("id", song.getId()); bundle.putString("id", song.getId());
bundle.putString("albumId", song.getAlbumId()); bundle.putString("albumId", song.getAlbumId());
@ -207,7 +209,7 @@ public class MappingUtil {
.setMediaId(song.getId()) .setMediaId(song.getId())
.setMediaMetadata( .setMediaMetadata(
new MediaMetadata.Builder() new MediaMetadata.Builder()
.setMediaUri(stream ? MusicUtil.getSongStreamUri(context, song) : MusicUtil.getSongDownloadUri(song)) .setMediaUri(stream && !isDownloaded ? MusicUtil.getSongStreamUri(context, song) : MusicUtil.getSongDownloadUri(song))
.setTitle(MusicUtil.getReadableString(song.getTitle())) .setTitle(MusicUtil.getReadableString(song.getTitle()))
.setTrackNumber(song.getTrackNumber()) .setTrackNumber(song.getTrackNumber())
.setDiscNumber(song.getDiscNumber()) .setDiscNumber(song.getDiscNumber())
@ -217,7 +219,7 @@ public class MappingUtil {
.setExtras(bundle) .setExtras(bundle)
.build() .build()
) )
.setUri(stream ? MusicUtil.getSongStreamUri(context, song) : MusicUtil.getSongDownloadUri(song)) .setUri(stream && !isDownloaded ? MusicUtil.getSongStreamUri(context, song) : MusicUtil.getSongDownloadUri(song))
.build(); .build();
} }
@ -230,23 +232,4 @@ public class MappingUtil {
return mediaItems; return mediaItems;
} }
public static ArrayList<MediaItem> markPlaylistMediaItems(ArrayList<MediaItem> mediaItems, String playlistId, String playlistName) {
ArrayList<MediaItem> toReturn = new ArrayList();
for(MediaItem mediaItem: mediaItems) {
toReturn.add(markPlaylistMediaItem(mediaItem, playlistId, playlistName));
}
return toReturn;
}
private static MediaItem markPlaylistMediaItem(MediaItem mediaItem, String playlistId, String playlistName) {
if (mediaItem.mediaMetadata.extras != null) {
mediaItem.mediaMetadata.extras.putString("playlistId", playlistId);
mediaItem.mediaMetadata.extras.putString("playlistName", playlistName);
}
return mediaItem;
}
} }