Playlist Parsers: Parse all (even invalid) playlist entries.

clementine-player · Nov 26, 2021 · 41178a8 · 41178a8
1 parent 590ab22
commit 41178a8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 16 deletions.
diff --git a/src/playlistparsers/asxiniparser.cpp b/src/playlistparsers/asxiniparser.cpp
@@ -40,10 +40,7 @@ SongList AsxIniParser::Load(QIODevice* device, const QString& playlist_path,
     QString value = line.mid(equals + 1);
 
     if (key.startsWith("ref")) {
-      Song song = LoadSong(value, 0, dir);
-      if (song.is_valid()) {
-        ret << song;
-      }
+      ret << LoadSong(value, 0, dir);
     }
   }
 

diff --git a/src/playlistparsers/asxparser.cpp b/src/playlistparsers/asxparser.cpp
@@ -71,10 +71,7 @@ SongList ASXParser::Load(QIODevice* device, const QString& playlist_path,
   }
 
   while (!reader.atEnd() && Utilities::ParseUntilElement(&reader, "entry")) {
-    Song song = ParseTrack(&reader, dir);
-    if (song.is_valid()) {
-      ret << song;
-    }
+    ret << ParseTrack(&reader, dir);
   }
   return ret;
 }

diff --git a/src/playlistparsers/wplparser.cpp b/src/playlistparsers/wplparser.cpp
@@ -55,10 +55,7 @@ void WplParser::ParseSeq(const QDir& dir, QXmlStreamReader* reader,
         if (name == "media") {
           QStringRef src = reader->attributes().value("src");
           if (!src.isEmpty()) {
-            Song song = LoadSong(src.toString(), 0, dir);
-            if (song.is_valid()) {
-              songs->append(song);
-            }
+            songs->append(LoadSong(src.toString(), 0, dir));
           }
         } else {
           Utilities::ConsumeCurrentElement(reader);

diff --git a/src/playlistparsers/xspfparser.cpp b/src/playlistparsers/xspfparser.cpp
@@ -42,10 +42,7 @@ SongList XSPFParser::Load(QIODevice* device, const QString& playlist_path,
   }
 
   while (!reader.atEnd() && Utilities::ParseUntilElement(&reader, "track")) {
-    Song song = ParseTrack(&reader, dir);
-    if (song.is_valid()) {
-      ret << song;
-    }
+    ret << ParseTrack(&reader, dir);
   }
   return ret;
 }