X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fttrss.c;h=2c57b4e93efefeff326575f9bef2b26897e89c4e;hp=89fbd94bd4b6edf5047e7dd18a2806e1ecd2a117;hb=fd2d79da502acb8dcb4589413b7f529c762997f1;hpb=6ad7426a45d5a4e76cbd67d2759b9f5e236443f6

diff --git a/src/ttrss.c b/src/ttrss.c
index 89fbd94..2c57b4e 100644
--- a/src/ttrss.c
+++ b/src/ttrss.c
@@ -70,13 +70,13 @@ void ttrss_login(const char *url, const char *user, const char *password)
 
 	content = json_object_object_get(rp, "content");
 	if (!content) {
-		fprintf(stderr, "Login failed: no content");
+		fprintf(stderr, "Login failed: no content\n");
 		return ;
 	}
 
 	error = json_object_object_get(content, "error");
 	if (error) {
-		fprintf(stderr, "Login failed");
+		fprintf(stderr, "Login failed\n");
 		return ;
 	}
 
@@ -94,6 +94,41 @@ void ttrss_login(const char *url, const char *user, const char *password)
 	json_object_put(rp);
 }
 
+const char *ttrss_get_headline_content(struct headline *h)
+{
+	struct json_object *rp, *rq, *content, *array, *item;
+
+	printf("get_headlines %d\n", h->id);
+
+	if (!h->content) {
+		rq = create_op("getArticle");
+		json_object_object_add(rq, "article_id",
+				       json_object_new_int(h->id));
+		
+		rp = post_json_object(session_url, rq);
+		
+		json_object_put(rq);
+		
+		array = json_object_object_get(rp, "content");
+
+		if (!array)
+			goto release;
+
+		item = json_object_array_get_idx(array, 0);
+
+		if (!item)
+			goto release;
+
+		content = json_object_object_get(item, "content");
+
+		h->content = strdup(json_object_get_string(content));
+			
+	release:
+		json_object_put(rp);
+	}
+	return h->content;
+}
+
 static struct headline **get_headlines(int feed_id)
 {
 	struct json_object *rp, *rq, *content, *jheadline, *j;
@@ -104,8 +139,6 @@ static struct headline **get_headlines(int feed_id)
 
 	rq = create_op("getHeadlines");
 	json_object_object_add(rq, "feed_id", json_object_new_int(feed_id));
-	json_object_object_add(rq, "show_excerpt", json_object_new_boolean(1));
-	json_object_object_add(rq, "show_content", json_object_new_boolean(1));
 
 	rp = post_json_object(session_url, rq);
 
@@ -121,14 +154,17 @@ static struct headline **get_headlines(int feed_id)
 
 			h = malloc(sizeof(struct headline));
 
+			j = json_object_object_get(jheadline, "id");
+			h->id = json_object_get_int(j);
+
 			j = json_object_object_get(jheadline, "title");
 			h->title = strdup(json_object_get_string(j));
 
-			j = json_object_object_get(jheadline, "excerpt");
-			h->excerpt = strdup(json_object_get_string(j));
+			j = json_object_object_get(jheadline, "link");
+			h->url = strdup(json_object_get_string(j));
 
-			j = json_object_object_get(jheadline, "content");
-			h->content = strdup(json_object_get_string(j));
+			h->excerpt = NULL;
+			h->content = NULL;
 
 			j = json_object_object_get(jheadline, "unread");
 			h->unread = json_object_get_boolean(j);
@@ -147,11 +183,45 @@ static struct headline **get_headlines(int feed_id)
 	return headlines;
 }
 
+static int feeds_length(struct feed **list)
+{
+	int n;
+
+	if (!list)
+		return 0;
+	
+	n = 0;
+	while(*list) {
+		n++;
+		list++;
+	}
+
+	return n;
+}
+
+static struct feed **feeds_add(struct feed **feeds, struct feed *feed)
+{
+	int n;
+	struct feed **result;
+
+	n = feeds_length(feeds);
+
+	result = malloc((n + 1 + 1) * sizeof(struct feed *));
+
+	if (feeds)
+		memcpy(result, feeds, n * sizeof(struct feed *));
+
+	result[n] = feed;
+	result[n + 1] = NULL;
+
+	return result;
+}
+
 struct feed **ttrss_get_feeds()
 {
 	struct json_object *rp, *rq, *content, *jfeed, *j;
 	int i, n;
-	struct feed **feeds, *feed;
+	struct feed **feeds, *feed, **tmp;
 
 	printf("ttrss_get_feeds\n");
 
@@ -165,7 +235,7 @@ struct feed **ttrss_get_feeds()
 	if (content) {
 		n = json_object_array_length(content);
 
-		feeds = malloc((n+1) * sizeof(struct feed *));
+		feeds = NULL;
 		for (i = 0; i < n; i++) {
 			jfeed = json_object_array_get_idx(content, i);
 
@@ -185,9 +255,10 @@ struct feed **ttrss_get_feeds()
 
 			feed->headlines = NULL;
 
-			feeds[i] = feed;
+			tmp = feeds_add(feeds, feed);
+			free(feeds);
+			feeds = tmp;
 		}
-		feeds[n] = NULL;
 	} else {
 		feeds = NULL;
 	}