Skip to content

Commit 41178a8

Browse files
committed
Playlist Parsers: Parse all (even invalid) playlist entries.
1 parent 590ab22 commit 41178a8

4 files changed

Lines changed: 4 additions & 16 deletions

File tree

src/playlistparsers/asxiniparser.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,7 @@ SongList AsxIniParser::Load(QIODevice* device, const QString& playlist_path,
4040
QString value = line.mid(equals + 1);
4141

4242
if (key.startsWith("ref")) {
43-
Song song = LoadSong(value, 0, dir);
44-
if (song.is_valid()) {
45-
ret << song;
46-
}
43+
ret << LoadSong(value, 0, dir);
4744
}
4845
}
4946

src/playlistparsers/asxparser.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,7 @@ SongList ASXParser::Load(QIODevice* device, const QString& playlist_path,
7171
}
7272

7373
while (!reader.atEnd() && Utilities::ParseUntilElement(&reader, "entry")) {
74-
Song song = ParseTrack(&reader, dir);
75-
if (song.is_valid()) {
76-
ret << song;
77-
}
74+
ret << ParseTrack(&reader, dir);
7875
}
7976
return ret;
8077
}

src/playlistparsers/wplparser.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,7 @@ void WplParser::ParseSeq(const QDir& dir, QXmlStreamReader* reader,
5555
if (name == "media") {
5656
QStringRef src = reader->attributes().value("src");
5757
if (!src.isEmpty()) {
58-
Song song = LoadSong(src.toString(), 0, dir);
59-
if (song.is_valid()) {
60-
songs->append(song);
61-
}
58+
songs->append(LoadSong(src.toString(), 0, dir));
6259
}
6360
} else {
6461
Utilities::ConsumeCurrentElement(reader);

src/playlistparsers/xspfparser.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@ SongList XSPFParser::Load(QIODevice* device, const QString& playlist_path,
4242
}
4343

4444
while (!reader.atEnd() && Utilities::ParseUntilElement(&reader, "track")) {
45-
Song song = ParseTrack(&reader, dir);
46-
if (song.is_valid()) {
47-
ret << song;
48-
}
45+
ret << ParseTrack(&reader, dir);
4946
}
5047
return ret;
5148
}

0 commit comments

Comments
 (0)