playlist/Print: don't skip non-existent songs in "listplaylist"

Skipping those songs silently will confuse the client, because commands specifying the song index within a playlist (e.g. playlistdelete) will be out of sync. This copies spl_print()'s behavior to playlist_file_print().

playlist/Print: don't skip non-existent songs in "listplaylist"
0cfd4fff · Max Kellermann · 8904127c · 0cfd4fff · 0cfd4fff
Commit 0cfd4fff authored Dec 09, 2014 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 6 deletions

NEWS NEWS +2 -0

Print.cxx src/playlist/Print.cxx +7 -6

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.19.7 (not yet released)
+* playlist
+  - don't skip non-existent songs in "listplaylist"

 ver 0.19.6 (2014/12/08)
 * decoder

--- a/src/playlist/Print.cxx
+++ b/src/playlist/Print.cxx
@@ -43,12 +43,13 @@ playlist_provider_print(Client &client, const char *uri,
 	DetachedSong *song;
 	while ((song = e.NextSong()) != nullptr) {
 		if (playlist_check_translate_song(*song, base_uri.c_str(),
-						  loader)) {
-			if (detail)
-				song_print_info(client, *song);
-			else
-				song_print_uri(client, *song);
-		}
+						  loader) &&
+		    detail)
+			song_print_info(client, *song);
+		else
+			/* fallback if no detail was requested or no
+			   detail was available */
+			song_print_uri(client, *song);

 		delete song;
 	}