Working multifeed RSS - needs testing

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@872 7f574dfc-610e-0410-a909-a81674777703

src/prss.c

@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2007 Mikko Sysikaski <mikko.sysikaski@gmail.com>
+ *                    Toni Spets <toni.spets@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <string.h>
@@ -17,8 +34,7 @@ PRSS* prss_parse_data(const char* xml_data)
 	if (!doc)
 		return NULL;
 	
-	PRSS* data = get_data(doc);
+	return get_data(doc);
-	return data;
 }
 PRSS* prss_parse_file(const char* xml_file)
 {
@@ -26,18 +42,33 @@ PRSS* prss_parse_file(const char* xml_file)
 	if (!doc)
 		return NULL;
 	
-	PRSS* data = get_data(doc);
+	return get_data(doc);
-	return data;
 }
 void prss_free(PRSS* data)
 {
+	if (!data)
+		return;
 	xmlFreeDoc(data->_data);
 	free(data->items);
+	free(data);
+}
+
+static inline void prss_null(PRSS* p)
+{
+	p->title = p->link = p->description = p->language = NULL;
+	p->items = NULL;
+	p->item_count = 0;
+}
+static inline void prss_null_item(PRSS_Item* i)
+{
+	i->title = i->link = i->description = i->category = i->pubdate = NULL;
 }
 
 static inline void read_item(PRSS_Item* res, xmlNodePtr data)
 {
-	res->title = res->link = res->description = 0;
+	prss_null_item(res);
+	
+	res->title = res->link = res->description = NULL;
 	for(; data; data = data->next) {
 		if (data->type != XML_ELEMENT_NODE)
 			continue;
@@ -55,51 +86,126 @@ static inline void read_item(PRSS_Item* res, xmlNodePtr data)
 			res->category = (char*)child->content;
 		} else if (!strcmp((char*)data->name, "pubDate")) {
 			res->pubdate = (char*)child->content;
+		} else if (!strcmp((char*)data->name, "guid")) {
+			res->guid = (char*)child->content;
 		}
 	}
 }
-
+static inline void read_element(PRSS* res, xmlNodePtr n)
-PRSS* get_data(xmlDocPtr doc)
 {
-	PRSS* result = malloc(sizeof(PRSS));
+	if (n->type != XML_ELEMENT_NODE)
-	xmlNodePtr channel = xmlDocGetRootElement(doc)->children->next;
+		return;
-	if (!channel) {
+	xmlNodePtr child = n->children;
-		fprintf(stderr, "Got root? No!\n");
+	if (!child)
-		return NULL;
+		return;
-	}
+		
-	result->_data = doc;
+	if (!strcmp((char*)n->name, "title")) {
-	result->title = result->link = result->description = result->language = NULL;
+		res->title = (char*)child->content;
+	} else if (!strcmp((char*)n->name, "link")) {
+		res->link = (char*)child->content;
+	} else if (!strcmp((char*)n->name, "description")) {
+		res->description = (char*)child->content;
+	} else if (!strcmp((char*)n->name, "language")) {
+		res->language = (char*)child->content;
+	} else if (!strcmp((char*)n->name, "pubDate")) {
+		res->pubdate = (char*)child->content;
+	} else if (!strcmp((char*)n->name, "lastBuildDate")) {
+		res->lastbuilddate = (char*)child->content;
+	} else if (!strcmp((char*)n->name, "generator")) {
+		res->generator = (char*)child->content;
+	} else if (!strcmp((char*)n->name, "docs")) {
+		res->docs = (char*)child->content;
+	} else if (!strcmp((char*)n->name, "managingEditor")) {
+		res->managingeditor = (char*)child->content;
+	} else if (!strcmp((char*)n->name, "webMaster")) {
+		res->webmaster = (char*)child->content;
+	} else if (!strcmp((char*)n->name, "item")) {
+		read_item(&res->items[res->item_count++], n->children);
+	}
+}
+
+static inline int parse_rss_2_0(PRSS* res, xmlNodePtr root)
+{
+	xmlNodePtr channel = root->children;
+	while(channel && (channel->type!=XML_ELEMENT_NODE || strcmp((char*)channel->name, "channel")))
+		channel = channel->next;
+	if (!channel)
+		return 0;
 
-	/* Get item count */
 	int items = 0;
 	xmlNodePtr n;
 	for(n = channel->children; n; n = n->next)
 		if (n->type==XML_ELEMENT_NODE && !strcmp((char*)n->name, "item"))
 			++items;
 	
-	result->item_count = items;
+	res->items = malloc(items*sizeof(PRSS_Item));
-	result->items = malloc(items*sizeof(PRSS_Item));
+	res->item_count = 0;
 
-	int cur_item = 0;
 	for(n = channel->children; n; n = n->next) {
-		if (n->type != XML_ELEMENT_NODE)
+		read_element(res, n);
-			continue;
+	}
-		xmlNodePtr child = n->children;
-		if (!child)
-			continue;
 
-		if (!strcmp((char*)n->name, "title")) {
+	return 1;
-			result->title = (char*)child->content;
+}
-		} else if (!strcmp((char*)n->name, "link")) {
+static inline int parse_rss_1_0(PRSS* res, xmlNodePtr root)
-			result->link = (char*)child->content;
+{
-		} else if (!strcmp((char*)n->name, "description")) {
+	int items = 0;
-			result->description = (char*)child->content;
+	xmlNodePtr n;
-		} else if (!strcmp((char*)n->name, "language")) {
+	for(n = root->children; n; n = n->next) {
-			result->language = (char*)child->content;
+		if (n->type==XML_ELEMENT_NODE) {
-		} else if (!strcmp((char*)n->name, "item")) {
+			if (!strcmp((char*)n->name, "item"))
-			read_item(&result->items[cur_item++], n->children);
+				++items;
+			else if (!strcmp((char*)n->name, "channel")) {
+				xmlNodePtr i;
+				for(i = n->children; i; i = i->next) {
+					read_element(res, i);
+				}
+			}
 		}
 	}
 	
+	res->items = malloc(items*sizeof(PRSS_Item));
+	res->item_count = 0;
+
+	for(n = root->children; n; n = n->next) {
+		if (n->type==XML_ELEMENT_NODE && !strcmp((char*)n->name, "item"))
+			read_item(&res->items[res->item_count++], n->children);
+	}
+	
+	return 1;
+}
+static inline int parse_rss_0_9x(PRSS* res, xmlNodePtr root)
+{
+	// almost same...
+	return parse_rss_2_0(res, root);
+}
+
+PRSS* get_data(xmlDocPtr doc)
+{
+	xmlNodePtr root = xmlDocGetRootElement(doc);
+	PRSS* result = malloc(sizeof(PRSS));
+	prss_null(result);
+	result->_data = doc;
+	do {
+		if (root->type == XML_ELEMENT_NODE) {
+			if (!strcmp((char*)root->name, "RDF")) {
+				// RSS 1.0 document
+				if (!parse_rss_1_0(result, root)) {
+					free(result);
+					return NULL;
+				}
+				return result;
+			} else if (!strcmp((char*)root->name, "rss")) {
+				// RSS 2.0 or <1.0 document
+				if (!parse_rss_2_0(result, root)) {
+					free(result);
+					return NULL;
+				}
 				return result;
 			}
+		}
+		root = root->next;
+	} while(root);
+	free(result);
+	return NULL;
+}

src/prss.h

@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2007 Mikko Sysikaski <mikko.sysikaski@gmail.com>
+ *                    Toni Spets <toni.spets@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
 #ifndef PRSS_H
 #define PRSS_H
 
@@ -9,6 +26,7 @@ typedef struct PRSS_Item_ {
 	char* description;
 	char* category;
 	char* pubdate;
+	char* guid;
 } PRSS_Item;
 
 typedef struct PRSS_ {
@@ -18,6 +36,12 @@ typedef struct PRSS_ {
 	char* link;
 	char* description;
 	char* language;
+	char* generator;
+	char* managingeditor;
+	char* webmaster;
+	char* docs;
+	char* lastbuilddate;
+	char* pubdate;
 
 	PRSS_Item* items;
 	int item_count;

src/rss.c

@@ -1,6 +1,9 @@
 /*
  * rss.c
  * RSS stuff (prss version)
+ *
+ * prss.c and prss.h written by Sisu (Mikko Sysikaski)
+ * new rss.c written by hifi (Toni Spets)
  */
 
 #include <stdio.h>
@@ -12,13 +15,22 @@
 #include <curl/types.h>
 #include <curl/easy.h>
 
-PRSS* save = NULL;
+#define MAX_FEEDS 16
 
 struct MemoryStruct {
 	char *memory;
 	size_t size;
 };
 
+typedef struct feed_ {
+	char* uri;
+	int last_update;
+	PRSS* data;
+} feed;
+
+int num_feeds = 0;
+feed feeds[MAX_FEEDS];
+
 size_t
 WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data)
 {
@@ -35,22 +47,21 @@ WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data)
 }
 
 
-int rss_delay(int delay)
+int rss_delay(int *wait, int delay)
 {
-	static int wait = 0;
 	time_t now = time(NULL);
 
 	// make it minutes
 	if(delay < 1) delay = 1;
 	delay *= 60;
 
-	if(!wait) {
+	if(!*wait) {
-		wait = now + delay;
+		*wait = now + delay;
 		return 1;
 	}
 
-	if(now >= wait + delay) {
+	if(now >= *wait + delay) {
-		wait = now + delay;
+		*wait = now + delay;
 		return 1;
 	}
 
@@ -62,15 +73,45 @@ get_rss_info(char *uri, int delay)
 {
 	CURL *curl = NULL;
 	CURLcode res;
+	// curl temps
 	struct MemoryStruct chunk;
 	chunk.memory = NULL;
 	chunk.size = 0;
 
-	if(!rss_delay(delay))
+	// pointers to struct
-		return save; // wait for delay to pass
+	feed *curfeed = NULL;
+	PRSS *curdata = NULL;
+	int *last_update = 0;
 
-	if(save != NULL)
+	int i;
-		prss_free(save); // clean up old data
+
+	// first seek for the uri in list
+	if(num_feeds > 0) {
+		for(i = 0; i < num_feeds; i++) {
+			if(feeds[i].uri != NULL)
+				if(!strcmp(feeds[i].uri, uri)) {
+					curfeed = &feeds[i];
+					break;
+				}
+		}
+	}
+
+	if(!curfeed) { // new feed
+		if(num_feeds == MAX_FEEDS-1) return NULL;
+		curfeed = &feeds[num_feeds];
+		curfeed->uri = (char *)malloc(sizeof(char) * strlen(uri)+1);
+		strncpy(curfeed->uri, uri, strlen(uri)+1);
+		num_feeds++;
+	}
+
+	last_update = &curfeed->last_update;
+	curdata = curfeed->data;
+
+	if(!rss_delay(last_update, delay))
+		return curdata; // wait for delay to pass
+
+	if(curdata != NULL)
+		prss_free(curdata); // clean up old data
 
 	curl = curl_easy_init();
 	if(curl) {
@@ -82,12 +123,14 @@ get_rss_info(char *uri, int delay)
 
 		res = curl_easy_perform(curl);
 		if(chunk.size) {
-			save = prss_parse_data(chunk.memory);
+			curdata = prss_parse_data(chunk.memory);
 			free(chunk.memory);
 		}
 
+		curfeed->data = curdata;
+
 		curl_easy_cleanup(curl);
 	}
 
-	return save;
+	return curdata;
 }