Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow Squeezeplay to display date in parentheses next to the album #1179

Open
wants to merge 1 commit into
base: public/9.0
Choose a base branch
from
+6 −4
Open

allow Squeezeplay to display date in parentheses next to the album #1179

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions Slim/Control/Queries.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3981,7 +3981,7 @@ sub statusQuery {

if ( $menuMode ) {
# Set required tags for menuMode
$tags = 'aAlKNcxJ';
$tags = 'aAlKNcxJy';
}
# DD - total playtime for the current playlist, nothing else returned
elsif ( $tags =~ /DD/ ) {
Expand Down Expand Up @@ -5105,7 +5105,7 @@ sub _addJivePlaylistControls {

# **********************************************************************
# *** This is a performance-critical method ***
# Take cake to understand the performance implications of any changes.
# Take care to understand the performance implications of any changes.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The truth lies in the cake, doesn't it? 😁


sub _addJiveSong {
my $request = shift; # request
Expand All @@ -5117,7 +5117,7 @@ sub _addJiveSong {
my $songData = _songData(
$request,
$track,
'aAlKNcxJ', # tags needed for our entities
'aAlKNcxJy', # tags needed for our entities
);

my $isRemote = $songData->{remote};
Expand All @@ -5128,6 +5128,7 @@ sub _addJiveSong {
my $title = $text;
my $album = $songData->{album};
my $artist = $songData->{artist};
my $year = $songData->{year};

# Bug 15779, include other role data
# XXX may want to include all contributor roles here?
Expand Down Expand Up @@ -5189,7 +5190,8 @@ sub _addJiveSong {
$request->addResultLoop($loop, $count, 'track', '');
}
if ( defined($album) ) {
$request->addResultLoop($loop, $count, 'album', $album);
my $parenYear = defined($year) && $year > 0 ? " ($year)" : '';
$request->addResultLoop($loop, $count, 'album', $album . $parenYear);
} else {
$request->addResultLoop($loop, $count, 'album', '');
}
Expand Down