LMS-Community / slimserver

Server for Squeezebox and compatible players. This server is also called Lyrion Music Server.
https://lyrion.org
Other
1.1k stars 279 forks source link

Backport fixes to Releases.pm (passthrough) and Commands.pm (adding multiple albums to playlist) #1092

Closed darrell-k closed 1 month ago

darrell-k commented 1 month ago

This backports #1083, #1084 and #1087 to 8.5.

As requested here https://github.com/LMS-Community/slimserver/pull/1083#issuecomment-2106649599 I tried a test merge of this into 9.0:

It won't merge automatically with a standard merge:

<<<<<<< HEAD
    # Add item for Classical Works if the artist has any.
    push @searchTags, "role_id:$menuRoles" if $menuRoles && $menuMode && $menuMode ne 'artists';
    main::INFOLOG && $log->is_info && $log->info("works ($index, $quantity): tags ->", join(', ', @searchTags));
    my $requestRef = [ 'works', 0, MAX_ALBUMS, @searchTags ];
    my $request = Slim::Control::Request->new( $client ? $client->id() : undef, $requestRef );
    $request->execute();
    $log->error($request->getStatusText()) if $request->isStatusError();

    push @items, {
        name        => cstring($client, 'WORKS_CLASSICAL'),
        image       => 'html/images/works.png',
        type        => 'playlist',
        playlist    => \&_tracks,
        url         => \&_works,
        passthrough => [ { searchTags => [@searchTags, "work_id:-1", "wantMetadata:1", "wantIndex:1"] } ],
    } if ( $request->getResult('count') > 1 || ( scalar @items && $request->getResult('count') ) );

=======
>>>>>>> backport-releases-pt

but since we don't need any actual code changes to 9.0 as a result of the merge, git merge -s ours ... does the job.