X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fttrss.c;h=d77007af5e98afa1ca03c1df69e245508d02229f;hp=a9fb0f88b81162cbd0d5047ca6a26cd1b67742f7;hb=03759c1d9512afb87624c268481d5c9c499e8275;hpb=4e8c884a282bcf16f486d06164ee187faa8a2610

diff --git a/src/ttrss.c b/src/ttrss.c
index a9fb0f8..d77007a 100644
--- a/src/ttrss.c
+++ b/src/ttrss.c
@@ -18,31 +18,43 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
+#include <glib.h>
 #include <json/json.h>
 
 #include "http.h"
-#include "ttrss_ws.h"
+#include "io.h"
+#include "log.h"
+#include "ttrss_cache.h"
+#include "ttrss_wsasync.h"
 #include "url.h"
 
 static struct feed **data;
-
-const char *ttrss_get_headline_content(struct headline *h)
+char *ttrss_get_headline_content(struct headline *h)
 {
-	if (!h->content)
-		h->content = ws_get_article_content(h->id);
+	char *content;
+
+	content = cache_get(h);
+
+	if (content) {
+		log_debug("ttrss_get_headline_content: cache hit");
+	} else {
+		log_debug("ttrss_get_headline_content: cache miss");
+		content = ws_get_article_content(h->id);
+		cache_put(h->id, content);
+	}
 
-	return h->content;
+	return content;
 }
 
 struct feed **ttrss_get_feeds()
 {
-	struct feed **tmp;
-
-	tmp = ws_update_feeds(data);
-	feeds_free(data);
-	data = tmp;
+	data = ws_update_feeds(data);
 
 	return data;
 }
@@ -57,24 +69,57 @@ struct headline **ttrss_feed_get_headlines(struct feed *f)
 
 void ttrss_set_article_unread(int id, int unread)
 {
-	struct json_object *rp, *rq;
-
-	printf("ttrss_set_article_unread %d %d\n", id, unread);
+	log_debug("ttrss_set_article_unread(%d,%d)", id, unread);
 
-	rq = ws_request_new("updateArticle");
-	json_object_object_add(rq, "article_ids", json_object_new_int(id));
-	json_object_object_add(rq, "field", json_object_new_int(2));
-	json_object_object_add(rq, "mode", json_object_new_int(unread));
+	ws_async_set_article_unread(id, unread);
 
-	rp = ws_execute(rq);
-
-	json_object_put(rq);
-	json_object_put(rp);
+	log_debug("ttrss_set_article_unread(%d,%d)", id, unread);
 }
 
 void ttrss_set_config(const char *url, const char *user, const char *pwd)
 {
 	feeds_free(data);
 	data = NULL;
-	ws_init(url, user, pwd);
+	ws_set_config(url, user, pwd);
+}
+
+struct feed *ttrss_get_feed(int id)
+{
+	return feeds_get_feed(data, id);
+}
+
+struct headline *ttrss_get_headline(int id)
+{
+	return feeds_get_headline(data, id);
+}
+
+static void get_article_content_cbk(int id, const char *content)
+{
+	printf("get_article_content_cbk %d\n", id);
+
+	if (content)
+		cache_put(id, content);
+}
+
+void ttrs_download_headline_content(struct feed **feeds)
+{
+	struct feed **fcur;
+	struct headline **hcur;
+
+	log_debug("ttrs_download_headline_content");
+
+	for (fcur = feeds; *fcur; fcur++) {
+		hcur = ttrss_feed_get_headlines(*fcur);
+
+		log_debug("ttrs_download_headline_content(): %s",
+			  (*fcur)->title);
+
+		while (hcur && *hcur) {
+			if (!cache_exists(*hcur)) {
+				ws_async_get_article_content
+					((*hcur)->id, get_article_content_cbk);
+			}
+			hcur++;
+		}
+	}
 }