X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fttrss.c;h=ad78c0b40f205066ead2527ceda94a3587fb64e9;hp=72dabdb3c5244507eb3fd220ccb58ce1f20168f0;hb=3ef3a6b2acadc5546328a4d96e584dc4f7215af5;hpb=18a74c10b6fbc90efce489f85445846b86c54492

diff --git a/src/ttrss.c b/src/ttrss.c
index 72dabdb..ad78c0b 100644
--- a/src/ttrss.c
+++ b/src/ttrss.c
@@ -18,14 +18,20 @@
  */
 
 #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 "io.h"
-#include "ttrss_ws.h"
+#include "log.h"
+#include "ttrss_wsasync.h"
 #include "url.h"
 
 static struct feed **data;
@@ -52,6 +58,8 @@ static void file_set_content(const char *path, const char *content)
 {
 	FILE *fp;
 
+	log_debug("file_set_content(): path=%s", path);
+
 	fp = fopen(path, "w");
 	if (fp) {
 		fwrite(content, 1, strlen(content), fp);
@@ -59,32 +67,53 @@ static void file_set_content(const char *path, const char *content)
 	}
 }
 
-const char *ttrss_get_headline_content(struct headline *h)
+static gchar *content_get_path(const struct headline *h)
 {
 	const char *cache_dir;
+
+	cache_dir = get_cache_dir();
+	if (cache_dir)
+		return g_strdup_printf("%s/%d", cache_dir, h->id);
+
+	return NULL;
+}
+
+static int is_content_cached(const struct headline *h)
+{
+	struct stat s;
+	char *path;
+	int result;
+
+	path = content_get_path(h);
+
+	if (stat(path, &s) == -1)
+		result = 0;
+	else
+		result = 1;
+
+	g_free(path);
+
+	return result;
+}
+
+char *ttrss_get_headline_content(struct headline *h)
+{
 	char *path, *content;
-	
-	if (!h->content) {
-		cache_dir = get_cache_dir();
-		if (cache_dir) {
-			path = g_strdup_printf("%s/%d", cache_dir, h->id);
-			
-			content = file_get_content(path);
-			
-			if (content) {
-				h->content = content;
-			} else {
-				h->content = ws_get_article_content(h->id);
-				
-				if (h->content)
-					file_set_content(path, h->content);
-			}
-
-			g_free(path);
-		}
+
+	path = content_get_path(h);
+	if (path)
+		content = file_get_content(path);
+	else
+		content = NULL;
+
+	if (!content) {
+		content = ws_get_article_content(h->id);
+		file_set_content(path, content);
 	}
 
-	return h->content;
+	g_free(path);
+
+	return content;
 }
 
 struct feed **ttrss_get_feeds()
@@ -104,26 +133,18 @@ struct headline **ttrss_feed_get_headlines(struct feed *f)
 
 void ttrss_set_article_unread(int id, int unread)
 {
-	struct json_object *rp, *rq;
+	log_debug("ttrss_set_article_unread(%d,%d)", id, unread);
 
-	printf("ttrss_set_article_unread %d %d\n", id, unread);
+	ws_async_set_article_unread(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));
-
-	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)
@@ -135,3 +156,19 @@ struct headline *ttrss_get_headline(int id)
 {
 	return feeds_get_headline(data, id);
 }
+
+void ttrs_download_headline_content(struct feed **feeds)
+{
+	struct feed **fcur;
+	struct headline **hcur;
+
+	for (fcur = feeds; *fcur; fcur++) {
+		hcur = ttrss_feed_get_headlines(*fcur);
+
+		while (hcur && *hcur) {
+			if (!is_content_cached(*hcur))
+				free(ttrss_get_headline_content(*hcur));
+			hcur++;
+		}
+	}
+}