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

diff --git a/src/ttrss.c b/src/ttrss.c
index ad78c0b..d77007a 100644
--- a/src/ttrss.c
+++ b/src/ttrss.c
@@ -24,95 +24,31 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-
 #include <glib.h>
 #include <json/json.h>
 
 #include "http.h"
 #include "io.h"
 #include "log.h"
+#include "ttrss_cache.h"
 #include "ttrss_wsasync.h"
 #include "url.h"
 
 static struct feed **data;
-static char *cache_dir;
-
-static const char *get_cache_dir()
-{
-	char *home;
-
-	if (!cache_dir) {
-		home = getenv("HOME");
-
-		if (!home)
-			return NULL;
-
-		cache_dir = path_append(home, ".prss/cache");
-		mkdirs(cache_dir, 0777);
-	}
-
-	return cache_dir;
-}
-
-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);
-		fclose(fp);
-	}
-}
-
-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;
+	char *content;
 
-	path = content_get_path(h);
-	if (path)
-		content = file_get_content(path);
-	else
-		content = NULL;
+	content = cache_get(h);
 
-	if (!content) {
+	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);
-		file_set_content(path, content);
+		cache_put(h->id, content);
 	}
 
-	g_free(path);
-
 	return content;
 }
 
@@ -157,17 +93,32 @@ 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 (!is_content_cached(*hcur))
-				free(ttrss_get_headline_content(*hcur));
+			if (!cache_exists(*hcur)) {
+				ws_async_get_article_content
+					((*hcur)->id, get_article_content_cbk);
+			}
 			hcur++;
 		}
 	}