X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fttrss.c;h=d01aac4ccb0922ff8ac6aa88c3b7b4013ff3b004;hp=4ac5fdf2d4a2ad820d8ea40715dd3ab0a00c3518;hb=f93956db82f2d478b1a3dfd34d3fe024d4afd636;hpb=31f62874654f7fd89e362616db13008f7bfc236a

diff --git a/src/ttrss.c b/src/ttrss.c
index 4ac5fdf..d01aac4 100644
--- 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,19 +102,11 @@ 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)