Skip to content

Commit

Permalink
Play all tracks from a list
Browse files Browse the repository at this point in the history 
Play all tracks from a playlist of user's track list. Even if the
default view is 50, but the list contains (e.g.) 100 items, pressing
the 'All Songs' play button will load all 100 items. Pagination is
basically disabled now.
A better implementation would be that 'All songs' only plays those in
the current view. However, when selecting play on the item before
opening the list, it should then load all songs. But there doesn't seem
to be distinction between those two different actions.
  • Loading branch information
@danielvijge
danielvijge committed Nov 26, 2024
1 parent ef5e9be commit 1567cc3
Showing 1 changed file with 25 additions and 32 deletions.
57 changes: 25 additions & 32 deletions Plugin.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -447,10 +447,10 @@ sub tracksHandler {

# The number of items to fetch, either specified in arguments or the maximum possible.
my $pageSize = API_DEFAULT_ITEMS_COUNT;
my $quantity = min(API_DEFAULT_ITEMS_COUNT, API_MAX_ITEMS);
my $quantity = ''; # placeholder for all, can be overwritten later

my $searchType = $passDict->{'type'};
my $searchStr = ($searchType eq 'tags') ? "tags=" : "q=";
my $searchStr = ($searchType eq 'tags') ? "&tags=" : "&q=";
my $search = $args->{'search'} ? $searchStr . URI::Escape::uri_escape_utf8($args->{'search'}) : '';

# The parser is the method that will be called when the
Expand All @@ -462,7 +462,7 @@ sub tracksHandler {
my $uid = $passDict->{'uid'} || '';
my $pid = $passDict->{'pid'} || '';

my $extras = '';
my $extras = 'access=playable,preview&linked_partitioning=true&limit=' . $pageSize;
my $resource;

# Check the given type (defined by the passthrough array). Depending
Expand All @@ -478,56 +478,45 @@ sub tracksHandler {
} else {
$resource = "playlists/$pid";
}
$extras = "access=playable,preview&linked_partitioning=true&limit=" . $pageSize;

} elsif ($searchType eq 'playlisttracks' && $pid ne '') {
$resource = "playlists/$pid/tracks";
$extras = "access=playable,preview&linked_partitioning=true&limit=" . $pageSize;

} elsif ($searchType eq 'playlistsearch') {
$resource = "playlists";
$extras = "access=playable,preview&linked_partitioning=true&limit=" . $pageSize;

} elsif ($searchType eq 'liked_playlists') {
$resource = "me/likes/playlists";
$extras = "access=playable,preview&linked_partitioning=true&limit=" . $pageSize;

} elsif ($searchType eq 'tracks') {
$resource = "users/$uid/tracks";
$extras = "access=playable,preview&linked_partitioning=true&limit=" . $pageSize;

} elsif ($searchType eq 'releated') {
$quantity = API_MAX_ITEMS;
my $id = $passDict->{'id'} || '';
$resource = "tracks/$id/related";
$extras = "access=playable,preview&linked_partitioning=true&limit=" . $pageSize;

} elsif ($searchType eq 'favorites') {
$resource = "users/$uid/likes/tracks";
if ($uid eq '') {
$resource = "me/likes/tracks";
}
$extras = "linked_partitioning=true&limit=" . $pageSize;

} elsif ($searchType eq 'friends') {
$resource = "me/followings";
$extras = "linked_partitioning=true&limit=" . $pageSize;

} elsif ($searchType eq 'users') {
# Override maximum quantity
$quantity = API_MAX_ITEMS;
$resource = "users";
$extras = "linked_partitioning=true&limit=" . $pageSize;

} elsif ($searchType eq 'friend') {
$resource = "users/$uid";
$extras = "linked_partitioning=true&limit=" . $pageSize;

} elsif ($searchType eq 'activities') {
# Override maximum quantity
$quantity = API_MAX_ITEMS;
$resource = "me/activities";
$extras = "access=playable,preview&linked_partitioning=true&limit=" . $pageSize;

} else {
$resource = "tracks";
Expand All @@ -538,10 +527,9 @@ sub tracksHandler {
if ( $args->{'search'} ) {
$params .= "&access=playable,preview";
}
$extras = "linked_partitioning=true&limit=" . $quantity;
}

my $queryUrl = "https://api.soundcloud.com/".$resource."?" . $extras . $params . "&" . $search;
my $queryUrl = "https://api.soundcloud.com/" . $resource . "?" . $extras . $params . $search;

_getTracks($client, $searchType, $index, $quantity, $queryUrl, $uid, $parser, $callback, $menu);

Expand Down Expand Up @@ -599,6 +587,11 @@ sub _getTracks {
$cache->set($prefix . $searchType . $uid . '-' . '-total', ($total), META_CACHE_TTL);
}

# if quantity is still '' (meaning all), the quantity is equal to the total item retrieved
if ($quantity eq '') {
$quantity = $total;
}

_callbackTracks($menu, $index, $quantity, $callback);

} else {;
Expand All @@ -622,25 +615,25 @@ sub _callbackTracks {
my ( $menu, $index, $quantity, $callback ) = @_;

my $total = scalar @$menu;
if ($quantity ne 1) {
$quantity = min($quantity, $total - $index);
}
# if ($quantity ne 1) {
# $quantity = min($quantity, $total - $index);
# }

my $returnMenu = [];
# my $returnMenu = [];

my $i = 0;
my $count = 0;
for my $entry (@$menu) {
if ($i >= $index && $count < $quantity) {
push @$returnMenu, $entry;
$count++;
}
$i++;
}
# my $i = 0;
# my $count = 0;
# for my $entry (@$menu) {
# if ($i >= $index && $count < $quantity) {
# push @$returnMenu, $entry;
# $count++;
# }
# $i++;
# }

$callback->({
items => $returnMenu,
offset => $index,
items => $menu,
offset => 0,
total => $total,
});
$log->debug('_callbackTracks ended.');
Expand Down

0 comments on commit 1567cc3

Please sign in to comment.