(no commit message)

[prss.git] / src / ttrss.c

diff --git a/src/ttrss.c b/src/ttrss.c
index 4ac5fdf..9833040 100644 (file)
--- a/src/ttrss.c
+++ b/src/ttrss.c
@@ -26,7 +26,8 @@
 
 #include "http.h"
 #include "io.h"
-#include "ttrss_ws.h"
+#include "log.h"
+#include "ttrss_wsasync.h"
 #include "url.h"
 
 static struct feed **data;
@@ -60,7 +61,7 @@ static void file_set_content(const char *path, const char *content)
        }
 }
 
-const char *ttrss_get_headline_content(struct headline *h)
+char *ttrss_get_headline_content(struct headline *h)
 {
        const char *cache_dir;
        char *path, *content;
@@ -68,18 +69,18 @@ const char *ttrss_get_headline_content(struct headline *h)
        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)
-                       file_set_content(path, content);
-               else
+
+               if (!content) {
                        content = ws_get_article_content(h->id);
-               
+                       file_set_content(path, content);
+               }
+
                g_free(path);
 
                return content;
-       } 
+       }
 
        return NULL;
 }
@@ -101,26 +102,18 @@ 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);
-
-       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));
+       log_debug("ttrss_set_article_unread(%d,%d)", id, unread);
 
-       rp = ws_execute(rq);
+       ws_async_set_article_unread(id, unread);
 
-       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)