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

Save in the database what has been downloaded

Browse source
This commit is contained in:
CappielloAntonio 2022-01-02 11:30:16 +01:00
parent 81e9b5c3d9
commit f416bfda8f
9 changed files with 59 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,6 +18,11 @@ import androidx.media3.exoplayer.offline.DownloadManager;
import androidx.media3.exoplayer.offline.DownloadRequest; import androidx.media3.exoplayer.offline.DownloadRequest;
import androidx.media3.exoplayer.offline.DownloadService; import androidx.media3.exoplayer.offline.DownloadService;
import com.cappielloantonio.play.App;
import com.cappielloantonio.play.repository.DownloadRepository;
import com.cappielloantonio.play.repository.QueueRepository;
import com.cappielloantonio.play.util.MappingUtil;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -81,24 +86,26 @@ public class DownloaderTracker {
} }
@SuppressLint("UnsafeOptInUsageError") @SuppressLint("UnsafeOptInUsageError")
public void download(MediaItem mediaItem) { public void download(MediaItem mediaItem, com.cappielloantonio.play.model.Download download) {
DownloadService.sendAddDownload(context, DownloaderService.class, buildDownloadRequest(mediaItem), false); DownloadService.sendAddDownload(context, DownloaderService.class, buildDownloadRequest(mediaItem), false);
downloadDatabase(download);
} }
public void download(List<MediaItem> mediaItems) { public void download(List<MediaItem> mediaItems, List<com.cappielloantonio.play.model.Download> downloads) {
for (MediaItem mediaItem : mediaItems) { for (int counter = 0; counter < mediaItems.size(); counter++) {
download(mediaItem); download(mediaItems.get(counter), downloads.get(counter));
} }
} }
@SuppressLint("UnsafeOptInUsageError") @SuppressLint("UnsafeOptInUsageError")
public void remove(MediaItem mediaItem) { public void remove(MediaItem mediaItem, com.cappielloantonio.play.model.Download download) {
DownloadService.sendRemoveDownload(context, DownloaderService.class, buildDownloadRequest(mediaItem).id, false); DownloadService.sendRemoveDownload(context, DownloaderService.class, buildDownloadRequest(mediaItem).id, false);
removeDatabase(download);
} }
public void remove(List<MediaItem> mediaItems) { public void remove(List<MediaItem> mediaItems, List<com.cappielloantonio.play.model.Download> downloads) {
for (MediaItem mediaItem : mediaItems) { for (int counter = 0; counter < mediaItems.size(); counter++) {
remove(mediaItem); remove(mediaItems.get(counter), downloads.get(counter));
} }
} }
@ -131,4 +138,16 @@ public class DownloaderTracker {
} }
} }
} }
private static DownloadRepository getDownloadRepository() {
return new DownloadRepository(App.getInstance());
}
private static void downloadDatabase(com.cappielloantonio.play.model.Download download) {
getDownloadRepository().insert(download);
}
private static void removeDatabase(com.cappielloantonio.play.model.Download download) {
getDownloadRepository().delete(download);
}
} }

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

@ -63,7 +63,10 @@ public class StarredSyncDialog extends DialogFragment {
((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> { ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> {
starredSyncViewModel.getStarredTracks(requireActivity()).observe(requireActivity(), songs -> { starredSyncViewModel.getStarredTracks(requireActivity()).observe(requireActivity(), songs -> {
if (songs != null) { if (songs != null) {
DownloadUtil.getDownloadTracker(context).download(MappingUtil.mapMediaItems(context, songs, false)); DownloadUtil.getDownloadTracker(context).download(
MappingUtil.mapMediaItems(context, songs, false),
MappingUtil.mapDownload(songs)
);
} }
}); });

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

@ -108,7 +108,10 @@ public class AlbumPageFragment extends Fragment {
if (item.getItemId() == R.id.action_download_album) { if (item.getItemId() == R.id.action_download_album) {
albumPageViewModel.getAlbumSongLiveList(requireActivity()).observe(requireActivity(), songs -> { albumPageViewModel.getAlbumSongLiveList(requireActivity()).observe(requireActivity(), songs -> {
if (isVisible() && getActivity() != null) { if (isVisible() && getActivity() != null) {
DownloadUtil.getDownloadTracker(requireContext()).download(MappingUtil.mapMediaItems(requireContext(), songs, false)); DownloadUtil.getDownloadTracker(requireContext()).download(
MappingUtil.mapMediaItems(requireContext(), songs, false),
MappingUtil.mapDownload(songs)
);
} }
}); });
return true; return true;

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

@ -111,7 +111,8 @@ public class PlaylistPageFragment extends Fragment {
MappingUtil.mapMediaItems(requireContext(), songs, false), MappingUtil.mapMediaItems(requireContext(), songs, false),
playlistPageViewModel.getPlaylist().getId(), playlistPageViewModel.getPlaylist().getId(),
playlistPageViewModel.getPlaylist().getName() playlistPageViewModel.getPlaylist().getName()
) ),
MappingUtil.mapDownload(songs)
); );
} }
}); });

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

@ -25,6 +25,7 @@ import com.cappielloantonio.play.R;
import com.cappielloantonio.play.glide.CustomGlideRequest; import com.cappielloantonio.play.glide.CustomGlideRequest;
import com.cappielloantonio.play.interfaces.MediaCallback; import com.cappielloantonio.play.interfaces.MediaCallback;
import com.cappielloantonio.play.model.Album; import com.cappielloantonio.play.model.Album;
import com.cappielloantonio.play.model.Download;
import com.cappielloantonio.play.model.Song; import com.cappielloantonio.play.model.Song;
import com.cappielloantonio.play.repository.AlbumRepository; import com.cappielloantonio.play.repository.AlbumRepository;
import com.cappielloantonio.play.service.MediaManager; import com.cappielloantonio.play.service.MediaManager;
@ -157,15 +158,16 @@ 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);
downloadAll.setOnClickListener(v -> { downloadAll.setOnClickListener(v -> {
DownloadUtil.getDownloadTracker(requireContext()).download(mediaItems); DownloadUtil.getDownloadTracker(requireContext()).download(mediaItems, downloads);
dismissBottomSheet(); dismissBottomSheet();
}); });
if (DownloadUtil.getDownloadTracker(requireContext()).areDownloaded(mediaItems)) { if (DownloadUtil.getDownloadTracker(requireContext()).areDownloaded(mediaItems)) {
removeAll.setOnClickListener(v -> { removeAll.setOnClickListener(v -> {
DownloadUtil.getDownloadTracker(requireContext()).remove(mediaItems); DownloadUtil.getDownloadTracker(requireContext()).remove(mediaItems, downloads);
dismissBottomSheet(); dismissBottomSheet();
}); });
} else { } else {

10
app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java
View file

@ -157,13 +157,19 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
TextView download = view.findViewById(R.id.download_text_view); TextView download = view.findViewById(R.id.download_text_view);
download.setOnClickListener(v -> { download.setOnClickListener(v -> {
DownloadUtil.getDownloadTracker(requireContext()).download(MappingUtil.mapMediaItem(requireContext(), song, false)); DownloadUtil.getDownloadTracker(requireContext()).download(
MappingUtil.mapMediaItem(requireContext(), song, false),
MappingUtil.mapDownload(song, null, null)
);
dismissBottomSheet(); dismissBottomSheet();
}); });
TextView remove = view.findViewById(R.id.remove_text_view); TextView remove = view.findViewById(R.id.remove_text_view);
remove.setOnClickListener(v -> { remove.setOnClickListener(v -> {
DownloadUtil.getDownloadTracker(requireContext()).remove(MappingUtil.mapMediaItem(requireContext(), song, false)); DownloadUtil.getDownloadTracker(requireContext()).remove(
MappingUtil.mapMediaItem(requireContext(), song, false),
MappingUtil.mapDownload(song, null, null)
);
dismissBottomSheet(); dismissBottomSheet();
}); });

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

@ -173,7 +173,7 @@ public class MappingUtil {
return playlists; return playlists;
} }
public static ArrayList<Download> mapToDownload(List<Song> songs) { public static ArrayList<Download> mapDownload(List<Song> songs) {
ArrayList<Download> downloads = new ArrayList(); ArrayList<Download> downloads = new ArrayList();
for (Song song : songs) { for (Song song : songs) {
@ -183,7 +183,7 @@ public class MappingUtil {
return downloads; return downloads;
} }
public static Download mapToDownload(Song song, String playlistId, String playlistName) { public static Download mapDownload(Song song, String playlistId, String playlistName) {
return new Download(song, playlistId, playlistName); return new Download(song, playlistId, playlistName);
} }

5
app/src/main/java/com/cappielloantonio/play/viewmodel/PlayerBottomSheetViewModel.java
View file

@ -57,7 +57,10 @@ public class PlayerBottomSheetViewModel extends AndroidViewModel {
song.setFavorite(true); song.setFavorite(true);
if (PreferenceUtil.getInstance(context).isStarredSyncEnabled()) { if (PreferenceUtil.getInstance(context).isStarredSyncEnabled()) {
DownloadUtil.getDownloadTracker(context).download(MappingUtil.mapMediaItem(context, song, false)); DownloadUtil.getDownloadTracker(context).download(
MappingUtil.mapMediaItem(context, song, false),
MappingUtil.mapDownload(song, null, null)
);
} }
} }
} }

5
app/src/main/java/com/cappielloantonio/play/viewmodel/SongBottomSheetViewModel.java
View file

@ -49,7 +49,10 @@ public class SongBottomSheetViewModel extends AndroidViewModel {
song.setFavorite(true); song.setFavorite(true);
if (PreferenceUtil.getInstance(context).isStarredSyncEnabled()) { if (PreferenceUtil.getInstance(context).isStarredSyncEnabled()) {
DownloadUtil.getDownloadTracker(context).download(MappingUtil.mapMediaItem(context, song, false)); DownloadUtil.getDownloadTracker(context).download(
MappingUtil.mapMediaItem(context, song, false),
MappingUtil.mapDownload(song, null, null)
);
} }
} }
} }