fixed code style

[prss.git] / src / ttrss.c

diff --git a/src/ttrss.c b/src/ttrss.c
index 9b76295..d77007a 100644 (file)
--- a/src/ttrss.c
+++ b/src/ttrss.c
@@ -20,6 +20,9 @@
 #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>
@@ -27,62 +30,26 @@
 #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;
-
-       fp = fopen(path, "w");
-       if (fp) {
-               fwrite(content, 1, strlen(content), fp);
-               fclose(fp);
-       }
-}
-
 char *ttrss_get_headline_content(struct headline *h)
 {
-       const char *cache_dir;
-       char *path, *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) {
-                       content = ws_get_article_content(h->id);
-                       file_set_content(path, content);
-               }
+       char *content;
 
-               g_free(path);
+       content = cache_get(h);
 
-               return 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);
+               cache_put(h->id, content);
        }
 
-       return NULL;
+       return content;
 }
 
 struct feed **ttrss_get_feeds()
@@ -126,16 +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) {
-                       free(ttrss_get_headline_content(*hcur));
+                       if (!cache_exists(*hcur)) {
+                               ws_async_get_article_content
+                                       ((*hcur)->id, get_article_content_cbk);
+                       }
                        hcur++;
                }
        }