From 1344103515ad844628900f5e52ef704b28e0cc24 Mon Sep 17 00:00:00 2001
From: David Sansome <davidsansome@gmail.com>
Date: Sat, 15 Jan 2011 13:58:35 +0000
Subject: [PATCH] Add a workaround for broken XML entities in ASX playlists

---
 src/playlistparsers/asxparser.cpp | 12 ++++++++++++
 tests/asxparser_test.cpp          | 23 +++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/src/playlistparsers/asxparser.cpp b/src/playlistparsers/asxparser.cpp
index b9c57a551..fad080324 100644
--- a/src/playlistparsers/asxparser.cpp
+++ b/src/playlistparsers/asxparser.cpp
@@ -47,6 +47,18 @@ SongList ASXParser::Load(QIODevice *device, const QString& playlist_path, const
     index += ex.matchedLength();
   }
 
+  // Some playlists have unescaped & characters in URLs :(
+  ex.setPattern("(href\\s*=\\s*\")([^\"]+)\"");
+  index = 0;
+  while ((index = ex.indexIn(data, index)) != -1) {
+    QString url = ex.cap(2);
+    url.replace(QRegExp("&(?!amp;|quot;|apos;|lt;|gt;)"), "&amp;");
+
+    QByteArray replacement = (ex.cap(1) + url + "\"").toLocal8Bit();
+    data.replace(ex.cap(0).toLocal8Bit(), replacement);
+    index += replacement.length();
+  }
+
   QBuffer buffer(&data);
   buffer.open(QIODevice::ReadOnly);
 
diff --git a/tests/asxparser_test.cpp b/tests/asxparser_test.cpp
index 294ac01cf..c61cc902c 100644
--- a/tests/asxparser_test.cpp
+++ b/tests/asxparser_test.cpp
@@ -70,6 +70,29 @@ TEST_F(ASXParserTest, ParsesMoreThanOneTrackFromXML) {
   EXPECT_EQ(Song::Type_Stream, songs[1].filetype());
 }
 
+TEST_F(ASXParserTest, ParsesBrokenXmlEntities) {
+  QByteArray data =
+      "<asx version = \"3.0\">"
+      "<Title>DI.fm</Title>"
+      "<Author>Digitally Imported Radio</Author>"
+      "<Copyright>2006 Digitally Imported., Inc</Copyright>"
+      "<MoreInfo href=\"http://www.di.fm/\" />"
+      "  <entry>"
+      "    <PARAM name=\"HTMLView\" value=\"http://www.di.fm/classictrance/pro/mini_playlist.html\"/>"
+      "    <ref href = \"mms://72.26.204.105/classictrance128k?user=h&pass=xxxxxxxxxxxxxxx\"/>"
+      "    <Title>Classic Trance</Title>"
+      "    <Author>Digitally Imported Premium</Author>"
+      "  </entry>"
+      "</asx>";
+
+  QBuffer buffer(&data);
+  buffer.open(QIODevice::ReadOnly);
+  ASXParser parser(NULL);
+  SongList songs = parser.Load(&buffer);
+  ASSERT_EQ(1, songs.length());
+  EXPECT_EQ("mms://72.26.204.105/classictrance128k?user=h&pass=xxxxxxxxxxxxxxx", songs[0].filename());
+}
+
 TEST_F(ASXParserTest, SavesSong) {
   QByteArray data;
   QBuffer buffer(&data);