playlist: added extm3u plugin

This new plugin parses extm3u files.  Files without the "#EXTM3U"
header are still parsed by the plain old "m3u" plugin.

6 files changed, 198 insertions, 1 deletions

diff --git a/Makefile.am b/Makefile.am
index d7167a4cc..9ffe96e05 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -142,6 +142,7 @@ mpd_headers = \
 	src/playlist_plugin.h \
 	src/playlist_list.h \
 	src/playlist_queue.h \
+	src/playlist/extm3u_playlist_plugin.h \
 	src/playlist/m3u_playlist_plugin.h \
 	src/playlist/pls_playlist_plugin.h \
 	src/playlist/xspf_playlist_plugin.h \
@@ -657,6 +658,7 @@ endif
 #
 
 PLAYLIST_SRC = \
+	src/playlist/extm3u_playlist_plugin.c \
 	src/playlist/m3u_playlist_plugin.c \
 	src/playlist/pls_playlist_plugin.c \
 	src/playlist/xspf_playlist_plugin.c \
diff --git a/NEWS b/NEWS
index 776278ff0..515bd5903 100644
--- a/NEWS
+++ b/NEWS
@@ -7,7 +7,7 @@ ver 0.16 (20??/??/??)
   - range support for "delete"
   - "previous" really plays the previous song
   - "addid" with negative position is deprecated
-  - "load" supports remote playlists (m3u, pls, asx, xspf, lastfm://)
+  - "load" supports remote playlists (extm3u, pls, asx, xspf, lastfm://)
   - allow changing replay gain mode on-the-fly
   - omitting the range end is possible
 * input:
diff --git a/doc/user.xml b/doc/user.xml
index 494e8af75..4638143ff 100644
--- a/doc/user.xml
+++ b/doc/user.xml
@@ -1338,6 +1338,14 @@ cd mpd-version</programlisting>
       </section>
 
       <section>
+        <title><varname>extm3u</varname></title>
+
+        <para>
+          Reads extended <filename>.m3u</filename> playlist files.
+        </para>
+      </section>
+
+      <section>
         <title><varname>pls</varname></title>
 
         <para>
diff --git a/src/playlist/extm3u_playlist_plugin.c b/src/playlist/extm3u_playlist_plugin.c
new file mode 100644
index 000000000..3f55e5ad4
--- /dev/null
+++ b/src/playlist/extm3u_playlist_plugin.c
@@ -0,0 +1,160 @@
+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "playlist/extm3u_playlist_plugin.h"
+#include "playlist_plugin.h"
+#include "text_input_stream.h"
+#include "uri.h"
+#include "song.h"
+#include "tag.h"
+
+#include <glib.h>
+
+#include <string.h>
+#include <stdlib.h>
+
+struct extm3u_playlist {
+	struct playlist_provider base;
+
+	struct text_input_stream *tis;
+};
+
+static struct playlist_provider *
+extm3u_open_stream(struct input_stream *is)
+{
+	struct extm3u_playlist *playlist;
+	const char *line;
+
+	playlist = g_new(struct extm3u_playlist, 1);
+	playlist->tis = text_input_stream_new(is);
+
+	line = text_input_stream_read(playlist->tis);
+	if (line == NULL || strcmp(line, "#EXTM3U") != 0) {
+		/* no EXTM3U header: fall back to the plain m3u
+		   plugin */
+		text_input_stream_free(playlist->tis);
+		g_free(playlist);
+		return NULL;
+	}
+
+	playlist_provider_init(&playlist->base, &extm3u_playlist_plugin);
+	return &playlist->base;
+}
+
+static void
+extm3u_close(struct playlist_provider *_playlist)
+{
+	struct extm3u_playlist *playlist = (struct extm3u_playlist *)_playlist;
+
+	text_input_stream_free(playlist->tis);
+	g_free(playlist);
+}
+
+/**
+ * Parse a EXTINF line.
+ *
+ * @param line the rest of the input line after the colon
+ */
+static struct tag *
+extm3u_parse_tag(const char *line)
+{
+	long duration;
+	char *endptr;
+	const char *name;
+	struct tag *tag;
+
+	duration = strtol(line, &endptr, 10);
+	if (endptr[0] != ',')
+		/* malformed line */
+		return NULL;
+
+	if (duration < 0)
+		/* 0 means unknown duration */
+		duration = 0;
+
+	name = g_strchug(endptr + 1);
+	if (*name == 0 && duration == 0)
+		/* no information available; don't allocate a tag
+		   object */
+		return NULL;
+
+	tag = tag_new();
+	tag->time = duration;
+
+	/* unfortunately, there is no real specification for the
+	   EXTM3U format, so we must assume that the string after the
+	   comma is opaque, and is just the song name*/
+	if (*name != 0)
+		tag_add_item(tag, TAG_NAME, name);
+
+	return tag;
+}
+
+static struct song *
+extm3u_read(struct playlist_provider *_playlist)
+{
+	struct extm3u_playlist *playlist = (struct extm3u_playlist *)_playlist;
+	struct tag *tag = NULL;
+	const char *line;
+	struct song *song;
+
+	do {
+		line = text_input_stream_read(playlist->tis);
+		if (line == NULL) {
+			if (tag != NULL)
+				tag_free(tag);
+			return NULL;
+		}
+
+		if (g_str_has_prefix(line, "#EXTINF:")) {
+			if (tag != NULL)
+				tag_free(tag);
+			tag = extm3u_parse_tag(line + 8);
+			continue;
+		}
+
+		while (*line != 0 && g_ascii_isspace(*line))
+			++line;
+	} while (line[0] == '#' || *line == 0);
+
+	song = song_remote_new(line);
+	song->tag = tag;
+	return song;
+}
+
+static const char *const extm3u_suffixes[] = {
+	"m3u",
+	NULL
+};
+
+static const char *const extm3u_mime_types[] = {
+	"audio/x-mpegurl",
+	NULL
+};
+
+const struct playlist_plugin extm3u_playlist_plugin = {
+	.name = "extm3u",
+
+	.open_stream = extm3u_open_stream,
+	.close = extm3u_close,
+	.read = extm3u_read,
+
+	.suffixes = extm3u_suffixes,
+	.mime_types = extm3u_mime_types,
+};
diff --git a/src/playlist/extm3u_playlist_plugin.h b/src/playlist/extm3u_playlist_plugin.h
new file mode 100644
index 000000000..07f18eafa
--- /dev/null
+++ b/src/playlist/extm3u_playlist_plugin.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_PLAYLIST_EXTM3U_PLAYLIST_PLUGIN_H
+#define MPD_PLAYLIST_EXTM3U_PLAYLIST_PLUGIN_H
+
+extern const struct playlist_plugin extm3u_playlist_plugin;
+
+#endif
diff --git a/src/playlist_list.c b/src/playlist_list.c
index c5c436f04..9b2395ad4 100644
--- a/src/playlist_list.c
+++ b/src/playlist_list.c
@@ -19,6 +19,7 @@
 
 #include "playlist_list.h"
 #include "playlist_plugin.h"
+#include "playlist/extm3u_playlist_plugin.h"
 #include "playlist/m3u_playlist_plugin.h"
 #include "playlist/xspf_playlist_plugin.h"
 #include "playlist/lastfm_playlist_plugin.h"
@@ -37,6 +38,7 @@
 #include <stdio.h>
 
 static const struct playlist_plugin *const playlist_plugins[] = {
+	&extm3u_playlist_plugin,
 	&m3u_playlist_plugin,
 	&xspf_playlist_plugin,
 	&pls_playlist_plugin,