9de5bb9e23
I've already changed the "playlistinfo" command to hide HTTP passwords, but forgot to do the same for the simpler "playlist" command. This patch changes queue_print_uris() to use the code from song_print_uri().
118 lines
3.3 KiB
C
118 lines
3.3 KiB
C
/*
|
|
* Copyright (C) 2003-2010 The Music Player Daemon Project
|
|
* http://www.musicpd.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#include "config.h"
|
|
#include "queue_print.h"
|
|
#include "queue.h"
|
|
#include "song.h"
|
|
#include "song_print.h"
|
|
#include "locate.h"
|
|
#include "client.h"
|
|
|
|
/**
|
|
* Send detailed information about a range of songs in the queue to a
|
|
* client.
|
|
*
|
|
* @param client the client which has requested information
|
|
* @param start the index of the first song (including)
|
|
* @param end the index of the last song (excluding)
|
|
*/
|
|
static void
|
|
queue_print_song_info(struct client *client, const struct queue *queue,
|
|
unsigned position)
|
|
{
|
|
song_print_info(client, queue_get(queue, position));
|
|
client_printf(client, "Pos: %u\nId: %u\n",
|
|
position, queue_position_to_id(queue, position));
|
|
}
|
|
|
|
void
|
|
queue_print_info(struct client *client, const struct queue *queue,
|
|
unsigned start, unsigned end)
|
|
{
|
|
assert(start <= end);
|
|
assert(end <= queue_length(queue));
|
|
|
|
for (unsigned i = start; i < end; ++i)
|
|
queue_print_song_info(client, queue, i);
|
|
}
|
|
|
|
void
|
|
queue_print_uris(struct client *client, const struct queue *queue,
|
|
unsigned start, unsigned end)
|
|
{
|
|
assert(start <= end);
|
|
assert(end <= queue_length(queue));
|
|
|
|
for (unsigned i = start; i < end; ++i) {
|
|
client_printf(client, "%i:", i);
|
|
song_print_uri(client, queue_get(queue, i));
|
|
}
|
|
}
|
|
|
|
void
|
|
queue_print_changes_info(struct client *client, const struct queue *queue,
|
|
uint32_t version)
|
|
{
|
|
for (unsigned i = 0; i < queue_length(queue); i++) {
|
|
if (queue_song_newer(queue, i, version))
|
|
queue_print_song_info(client, queue, i);
|
|
}
|
|
}
|
|
|
|
void
|
|
queue_print_changes_position(struct client *client, const struct queue *queue,
|
|
uint32_t version)
|
|
{
|
|
for (unsigned i = 0; i < queue_length(queue); i++)
|
|
if (queue_song_newer(queue, i, version))
|
|
client_printf(client, "cpos: %i\nId: %i\n",
|
|
i, queue_position_to_id(queue, i));
|
|
}
|
|
|
|
void
|
|
queue_search(struct client *client, const struct queue *queue,
|
|
const struct locate_item_list *criteria)
|
|
{
|
|
unsigned i;
|
|
struct locate_item_list *new_list =
|
|
locate_item_list_casefold(criteria);
|
|
|
|
for (i = 0; i < queue_length(queue); i++) {
|
|
const struct song *song = queue_get(queue, i);
|
|
|
|
if (locate_song_search(song, new_list))
|
|
queue_print_song_info(client, queue, i);
|
|
}
|
|
|
|
locate_item_list_free(new_list);
|
|
}
|
|
|
|
void
|
|
queue_find(struct client *client, const struct queue *queue,
|
|
const struct locate_item_list *criteria)
|
|
{
|
|
for (unsigned i = 0; i < queue_length(queue); i++) {
|
|
const struct song *song = queue_get(queue, i);
|
|
|
|
if (locate_song_match(song, criteria))
|
|
queue_print_song_info(client, queue, i);
|
|
}
|
|
}
|