antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2026-04-15 16:27:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wip: more instant mix refactor to be able to accumulate tracks

Browse source
This commit is contained in:
eddyizm 2025-12-29 16:36:42 -08:00
parent 10673a49d4
commit 8c5390bfef
No known key found for this signature in database
GPG key ID: CF5F671829E8158A
1 changed files with 78 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

78
app/src/main/java/com/cappielloantonio/tempo/repository/SongRepository.java
View file

@ -87,7 +87,45 @@ public class SongRepository {
* Overloaded method used by other Repositories * Overloaded method used by other Repositories
*/ */
public void getInstantMix(String id, SeedType type, int count, MediaCallbackInternal callback) { public void getInstantMix(String id, SeedType type, int count, MediaCallbackInternal callback) {
performSmartMix(id, type, count, callback); new MediaCallbackAccumulator(callback, count).start(id, type);
}
private class MediaCallbackAccumulator {
private final MediaCallbackInternal originalCallback;
private final int targetCount;
private final List<Child> accumulatedSongs = new ArrayList<>();
private boolean isComplete = false;
MediaCallbackAccumulator(MediaCallbackInternal callback, int count) {
this.originalCallback = callback;
this.targetCount = count;
}
void start(String id, SeedType type) {
performSmartMix(id, type, targetCount, this::onBatchReceived);
}
private void onBatchReceived(List<Child> batch) {
if (isComplete || batch == null || batch.isEmpty()) {
return;
}
int added = 0;
for (Child s : batch) {
if (!accumulatedSongs.contains(s) && accumulatedSongs.size() < targetCount) {
accumulatedSongs.add(s);
added++;
}
}
if (added > 0) {
originalCallback.onSongsAvailable(new ArrayList<>(accumulatedSongs));
if (accumulatedSongs.size() >= targetCount) {
isComplete = true;
android.util.Log.d("SongRepository", "Reached target of " + targetCount + " songs");
}
}
}
} }
private void performSmartMix(final String id, final SeedType type, final int count, final MediaCallbackInternal callback) { private void performSmartMix(final String id, final SeedType type, final int count, final MediaCallbackInternal callback) {
@ -111,8 +149,14 @@ public class SongRepository {
if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getAlbum() != null) { if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getAlbum() != null) {
List<Child> albumSongs = response.body().getSubsonicResponse().getAlbum().getSongs(); List<Child> albumSongs = response.body().getSubsonicResponse().getAlbum().getSongs();
if (albumSongs != null && !albumSongs.isEmpty()) { if (albumSongs != null && !albumSongs.isEmpty()) {
callback.onSongsAvailable(new ArrayList<>(albumSongs)); List<Child> limitedAlbumSongs = albumSongs.subList(0, Math.min(count, albumSongs.size()));
fetchSimilarByArtist(albumSongs.get(0).getArtistId(), count, callback); callback.onSongsAvailable(new ArrayList<>(limitedAlbumSongs));
// If we need more, get similar songs
int remaining = count - limitedAlbumSongs.size();
if (remaining > 0) {
fetchSimilarByArtist(albumSongs.get(0).getArtistId(), remaining, callback);
}
return; return;
} }
} }
@ -132,7 +176,10 @@ public class SongRepository {
Child song = response.body().getSubsonicResponse().getSong(); Child song = response.body().getSubsonicResponse().getSong();
if (song != null) { if (song != null) {
callback.onSongsAvailable(Collections.singletonList(song)); callback.onSongsAvailable(Collections.singletonList(song));
fetchSimilarOnly(trackId, count, callback); int remaining = count - 1;
if (remaining > 0) {
fetchSimilarOnly(trackId, remaining, callback);
}
return; return;
} }
} }
@ -144,13 +191,14 @@ public class SongRepository {
}); });
} }
private void fetchSimilarOnly(String id, int count, MediaCallbackInternal callback) { private void fetchSimilarOnly(String id, int count, MediaCallbackInternal callback) {
App.getSubsonicClientInstance(false).getBrowsingClient().getSimilarSongs(id, count).enqueue(new Callback<ApiResponse>() { App.getSubsonicClientInstance(false).getBrowsingClient().getSimilarSongs(id, count).enqueue(new Callback<ApiResponse>() {
@Override @Override
public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) { public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
List<Child> songs = extractSongs(response, "similarSongs"); List<Child> songs = extractSongs(response, "similarSongs");
if (!songs.isEmpty()) { if (!songs.isEmpty()) {
callback.onSongsAvailable(songs); List<Child> limitedSongs = songs.subList(0, Math.min(count, songs.size()));
callback.onSongsAvailable(limitedSongs);
} else { } else {
fillWithRandom(count, callback); fillWithRandom(count, callback);
} }
@ -159,8 +207,7 @@ public class SongRepository {
fillWithRandom(count, callback); fillWithRandom(count, callback);
} }
}); });
} }
private void fetchSimilarByArtist(String artistId, final int count, final MediaCallbackInternal callback) { private void fetchSimilarByArtist(String artistId, final int count, final MediaCallbackInternal callback) {
App.getSubsonicClientInstance(false) App.getSubsonicClientInstance(false)
.getBrowsingClient() .getBrowsingClient()
@ -170,7 +217,8 @@ public class SongRepository {
public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) { public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
List<Child> similar = extractSongs(response, "similarSongs2"); List<Child> similar = extractSongs(response, "similarSongs2");
if (!similar.isEmpty()) { if (!similar.isEmpty()) {
callback.onSongsAvailable(similar); List<Child> limitedSimilar = similar.subList(0, Math.min(count, similar.size()));
callback.onSongsAvailable(limitedSimilar);
} else { } else {
fillWithRandom(count, callback); fillWithRandom(count, callback);
} }
@ -189,9 +237,17 @@ public class SongRepository {
.enqueue(new Callback<ApiResponse>() { .enqueue(new Callback<ApiResponse>() {
@Override @Override
public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) { public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
callback.onSongsAvailable(extractSongs(response, "randomSongs")); List<Child> random = extractSongs(response, "randomSongs");
if (!random.isEmpty()) {
List<Child> limitedRandom = random.subList(0, Math.min(target, random.size()));
callback.onSongsAvailable(limitedRandom);
} else {
callback.onSongsAvailable(new ArrayList<>());
}
}
@Override public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {
callback.onSongsAvailable(new ArrayList<>());
} }
@Override public void onFailure(@NonNull Call<ApiResponse> call, @NonNull Throwable t) {}
}); });
} }