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.

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

Print positions in the search playlist function #2109

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ ver 0.24 (not yet released)
- "sticker find" supports sort and window parameter and new sticker compare operators "eq", "lt" and "gt"
- consume only idle flags that were subscribed to
- volume command is no longer deprecated
- searching stored playlists respond now with song position
* database
- attribute "added" shows when each song was added to the database
- fix integer overflows with 64-bit inode numbers
Expand Down
15 changes: 12 additions & 3 deletions src/playlist/Print.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
#include "Partition.hxx"
#include "Instance.hxx"
#include "PlaylistError.hxx"
#include <fmt/format.h>
#include "client/Response.hxx"

static void
playlist_provider_print(Response &r,
Expand Down Expand Up @@ -69,27 +71,34 @@ playlist_provider_search_print(Response &r,

unsigned skip = start_index;
unsigned n = end_index - start_index;
unsigned position = 0;

while ((song = e.NextSong()) != nullptr) {
const bool detail = playlist_check_translate_song(*song, base_uri,
loader);
if (!filter->Match(static_cast<LightSong>(*song)))
if (!filter->Match(static_cast<LightSong>(*song))) {
++position;
continue;
}

if (skip > 0) {
--skip;
++position;
continue;
}

if (detail)
if (detail) {
song_print_info(r, *song);
else
r.Fmt(FMT_STRING("Pos: {}\n"), position);
} else
/* fallback if no detail was requested or no
detail was available */
song_print_uri(r, *song);

if (--n == 0)
break;

++position;
}
}

Expand Down