From ba60fbc4274e85fb63d373207f525aa57bc75eb3 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sat, 22 Oct 2011 16:34:48 +0200
Subject: Support seed stations

Fixes #165
---
 src/libpiano/xml.c | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

(limited to 'src/libpiano/xml.c')

diff --git a/src/libpiano/xml.c b/src/libpiano/xml.c
index 7f21f8d..1dd2a24 100644
--- a/src/libpiano/xml.c
+++ b/src/libpiano/xml.c
@@ -831,6 +831,7 @@ struct PianoXmlParseSeedBag {
 	char *seedId;
 	PianoSong_t *song;
 	PianoArtist_t *artist;
+	PianoStation_t *station;
 };
 
 /*	parse seed struct
@@ -853,6 +854,14 @@ static void PianoXmlParseSeedCb (const char *key, const ezxml_t value,
 
 		PianoXmlStructParser (ezxml_child (value, "struct"),
 				PianoXmlParseSearchArtistCb, bag->artist);
+	} else if (strcmp ("nonGenomeStation", key) == 0) {
+		/* genre stations are "non genome" station seeds */
+		if ((bag->station = calloc (1, sizeof (*bag->station))) == NULL) {
+			return;
+		}
+
+		PianoXmlStructParser (ezxml_child (value, "struct"),
+				PianoXmlParseStationsCb, bag->station);
 	} else if (strcmp ("seedId", key) == 0) {
 		char *valueStr = PianoXmlGetNodeText (value);
 		bag->seedId = strdup (valueStr);
@@ -875,10 +884,15 @@ static void PianoXmlParseGetStationInfoCb (const char *key, const ezxml_t value,
 			PianoXmlStructParser (ezxml_child (seedNode, "struct"),
 					PianoXmlParseSeedCb, &bag);
 
-			/* FIXME: use if-clause */
-			assert (bag.seedId != NULL);
-			assert (bag.song != NULL || bag.artist != NULL);
+			assert (bag.song != NULL || bag.artist != NULL ||
+					bag.station != NULL);
+
+			if (bag.seedId == NULL) {
+				/* seeds without id are useless */
+				continue;
+			}
 
+			/* FIXME: copy&waste */
 			if (bag.song != NULL) {
 				bag.song->seedId = bag.seedId;
 
@@ -903,6 +917,18 @@ static void PianoXmlParseGetStationInfoCb (const char *key, const ezxml_t value,
 					}
 					curSong->next = bag.artist;
 				}
+			} else if (bag.station != NULL) {
+				bag.station->seedId = bag.seedId;
+
+				if (info->stationSeeds == NULL) {
+					info->stationSeeds = bag.station;
+				} else {
+					PianoStation_t *curStation = info->stationSeeds;
+					while (curStation->next != NULL) {
+						curStation = curStation->next;
+					}
+					curStation->next = bag.station;
+				}
 			} else {
 				free (bag.seedId);
 			}
-- 
cgit v1.2.3