1 files changed, 40 insertions, 107 deletions

diff --git a/src/playlist/XspfPlaylistPlugin.cxx b/src/playlist/XspfPlaylistPlugin.cxx
index dcfab5a80..2157dd678 100644
--- a/src/playlist/XspfPlaylistPlugin.cxx
+++ b/src/playlist/XspfPlaylistPlugin.cxx
@@ -21,15 +21,14 @@
 #include "XspfPlaylistPlugin.hxx"
 #include "PlaylistPlugin.hxx"
 #include "MemorySongEnumerator.hxx"
+#include "DetachedSong.hxx"
 #include "InputStream.hxx"
-#include "tag/Tag.hxx"
+#include "tag/TagBuilder.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
+#include "Expat.hxx"
 #include "Log.hxx"
 
-#include <glib.h>
-
-#include <assert.h>
 #include <string.h>
 
 static constexpr Domain xspf_domain("xspf");
@@ -42,7 +41,7 @@ struct XspfParser {
 	 * The list of songs (in reverse order because that's faster
 	 * while adding).
 	 */
-	std::forward_list<SongPointer> songs;
+	std::forward_list<DetachedSong> songs;
 
 	/**
 	 * The current position in the XML file.
@@ -57,24 +56,22 @@ struct XspfParser {
 	 * valid if state==TRACK.  TAG_NUM_OF_ITEM_TYPES means there
 	 * is no (known) tag.
 	 */
-	TagType tag;
+	TagType tag_type;
 
 	/**
-	 * The current song.  It is allocated after the "location"
-	 * element.
+	 * The current song URI.  It is set by the "location" element.
 	 */
-	Song *song;
+	std::string location;
+
+	TagBuilder tag_builder;
 
 	XspfParser()
 		:state(ROOT) {}
 };
 
-static void
-xspf_start_element(gcc_unused GMarkupParseContext *context,
-		   const gchar *element_name,
-		   gcc_unused const gchar **attribute_names,
-		   gcc_unused const gchar **attribute_values,
-		   gpointer user_data, gcc_unused GError **error)
+static void XMLCALL
+xspf_start_element(void *user_data, const XML_Char *element_name,
+		   gcc_unused const XML_Char **atts)
 {
 	XspfParser *parser = (XspfParser *)user_data;
 
@@ -94,8 +91,8 @@ xspf_start_element(gcc_unused GMarkupParseContext *context,
 	case XspfParser::TRACKLIST:
 		if (strcmp(element_name, "track") == 0) {
 			parser->state = XspfParser::TRACK;
-			parser->song = nullptr;
-			parser->tag = TAG_NUM_OF_ITEM_TYPES;
+			parser->location.clear();
+			parser->tag_type = TAG_NUM_OF_ITEM_TYPES;
 		}
 
 		break;
@@ -104,17 +101,17 @@ xspf_start_element(gcc_unused GMarkupParseContext *context,
 		if (strcmp(element_name, "location") == 0)
 			parser->state = XspfParser::LOCATION;
 		else if (strcmp(element_name, "title") == 0)
-			parser->tag = TAG_TITLE;
+			parser->tag_type = TAG_TITLE;
 		else if (strcmp(element_name, "creator") == 0)
 			/* TAG_COMPOSER would be more correct
 			   according to the XSPF spec */
-			parser->tag = TAG_ARTIST;
+			parser->tag_type = TAG_ARTIST;
 		else if (strcmp(element_name, "annotation") == 0)
-			parser->tag = TAG_COMMENT;
+			parser->tag_type = TAG_COMMENT;
 		else if (strcmp(element_name, "album") == 0)
-			parser->tag = TAG_ALBUM;
+			parser->tag_type = TAG_ALBUM;
 		else if (strcmp(element_name, "trackNum") == 0)
-			parser->tag = TAG_TRACK;
+			parser->tag_type = TAG_TRACK;
 
 		break;
 
@@ -123,10 +120,8 @@ xspf_start_element(gcc_unused GMarkupParseContext *context,
 	}
 }
 
-static void
-xspf_end_element(gcc_unused GMarkupParseContext *context,
-		 const gchar *element_name,
-		 gpointer user_data, gcc_unused GError **error)
+static void XMLCALL
+xspf_end_element(void *user_data, const XML_Char *element_name)
 {
 	XspfParser *parser = (XspfParser *)user_data;
 
@@ -148,12 +143,13 @@ xspf_end_element(gcc_unused GMarkupParseContext *context,
 
 	case XspfParser::TRACK:
 		if (strcmp(element_name, "track") == 0) {
-			if (parser->song != nullptr)
-				parser->songs.emplace_front(parser->song);
+			if (!parser->location.empty())
+				parser->songs.emplace_front(std::move(parser->location),
+							    parser->tag_builder.Commit());
 
 			parser->state = XspfParser::TRACKLIST;
 		} else
-			parser->tag = TAG_NUM_OF_ITEM_TYPES;
+			parser->tag_type = TAG_NUM_OF_ITEM_TYPES;
 
 		break;
 
@@ -163,10 +159,8 @@ xspf_end_element(gcc_unused GMarkupParseContext *context,
 	}
 }
 
-static void
-xspf_text(gcc_unused GMarkupParseContext *context,
-	  const gchar *text, gsize text_len,
-	  gpointer user_data, gcc_unused GError **error)
+static void XMLCALL
+xspf_char_data(void *user_data, const XML_Char *s, int len)
 {
 	XspfParser *parser = (XspfParser *)user_data;
 
@@ -177,43 +171,19 @@ xspf_text(gcc_unused GMarkupParseContext *context,
 		break;
 
 	case XspfParser::TRACK:
-		if (parser->song != nullptr &&
-		    parser->tag != TAG_NUM_OF_ITEM_TYPES) {
-			if (parser->song->tag == nullptr)
-				parser->song->tag = new Tag();
-			parser->song->tag->AddItem(parser->tag, text, text_len);
-		}
+		if (!parser->location.empty() &&
+		    parser->tag_type != TAG_NUM_OF_ITEM_TYPES)
+			parser->tag_builder.AddItem(parser->tag_type, s, len);
 
 		break;
 
 	case XspfParser::LOCATION:
-		if (parser->song == nullptr) {
-			char *uri = g_strndup(text, text_len);
-			parser->song = Song::NewRemote(uri);
-			g_free(uri);
-		}
+		parser->location.assign(s, len);
 
 		break;
 	}
 }
 
-static const GMarkupParser xspf_parser = {
-	xspf_start_element,
-	xspf_end_element,
-	xspf_text,
-	nullptr,
-	nullptr,
-};
-
-static void
-xspf_parser_destroy(gpointer data)
-{
-	XspfParser *parser = (XspfParser *)data;
-
-	if (parser->state >= XspfParser::TRACK && parser->song != nullptr)
-		parser->song->Free();
-}
-
 /*
  * The playlist object
  *
@@ -223,58 +193,21 @@ static SongEnumerator *
 xspf_open_stream(InputStream &is)
 {
 	XspfParser parser;
-	GMarkupParseContext *context;
-	char buffer[1024];
-	size_t nbytes;
-	bool success;
-	Error error2;
-	GError *error = nullptr;
-
-	/* parse the XSPF XML file */
-
-	context = g_markup_parse_context_new(&xspf_parser,
-					     G_MARKUP_TREAT_CDATA_AS_TEXT,
-					     &parser, xspf_parser_destroy);
-
-	while (true) {
-		nbytes = is.LockRead(buffer, sizeof(buffer), error2);
-		if (nbytes == 0) {
-			if (error2.IsDefined()) {
-				g_markup_parse_context_free(context);
-				LogError(error2);
-				return nullptr;
-			}
-
-			break;
-		}
 
-		success = g_markup_parse_context_parse(context, buffer, nbytes,
-						       &error);
-		if (!success) {
-			FormatError(xspf_domain,
-				    "XML parser failed: %s", error->message);
-			g_error_free(error);
-			g_markup_parse_context_free(context);
+	{
+		ExpatParser expat(&parser);
+		expat.SetElementHandler(xspf_start_element, xspf_end_element);
+		expat.SetCharacterDataHandler(xspf_char_data);
+
+		Error error;
+		if (!expat.Parse(is, error)) {
+			LogError(error);
 			return nullptr;
 		}
 	}
 
-	success = g_markup_parse_context_end_parse(context, &error);
-	if (!success) {
-		FormatError(xspf_domain,
-			    "XML parser failed: %s", error->message);
-		g_error_free(error);
-		g_markup_parse_context_free(context);
-		return nullptr;
-	}
-
 	parser.songs.reverse();
-	MemorySongEnumerator *playlist =
-		new MemorySongEnumerator(std::move(parser.songs));
-
-	g_markup_parse_context_free(context);
-
-	return playlist;
+	return new MemorySongEnumerator(std::move(parser.songs));
 }
 
 static const char *const xspf_suffixes[] = {