X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fttrss_ws.c;h=d2c673f3588c309bb24011246ab6bb71792880e8;hp=8ec1746a9589123ef73c8a08689ded9dd63f8132;hb=54c2b8d3bd8fe1a775263657d4c2d317de37f1e6;hpb=f96659e59301af90fd058031486a98317b077caa

diff --git a/src/ttrss_ws.c b/src/ttrss_ws.c
index 8ec1746..d2c673f 100644
--- a/src/ttrss_ws.c
+++ b/src/ttrss_ws.c
@@ -17,9 +17,11 @@
  * 02110-1301 USA
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
+
+#include <pthread.h>
 
 #include <json/json.h>
 
@@ -28,6 +30,8 @@
 #include "ttrss_ws.h"
 #include "url.h"
 
+static pthread_mutex_t *lock;
+
 static char *session_id;
 static char *session_url;
 static char *session_user;
@@ -43,6 +47,11 @@ void ws_request_add_att_int(json_object *rq, const char *k, int v)
 	json_object_object_add(rq, k, json_object_new_int(v));
 }
 
+void ws_request_add_att_bool(json_object *rq, const char *k, int v)
+{
+	json_object_object_add(rq, k, json_object_new_boolean(v));
+}
+
 struct json_object *ws_request_new(const char *op)
 {
 	struct json_object *rq;
@@ -57,7 +66,7 @@ struct json_object *ws_request_new(const char *op)
 	return rq;
 }
 
-void ws_init(const char *url, const char *user, const char *pwd)
+void ws_set_config(const char *url, const char *user, const char *pwd)
 {
 	char *tmp;
 
@@ -125,6 +134,8 @@ struct json_object *ws_execute(struct json_object *rq)
 	struct json_object *result;
 
 	log_debug("ws_execute()");
+	pthread_mutex_lock(lock);
+	log_debug("ws_execute() lock");
 
 	err = NULL;
 	result = execute(rq, &err);
@@ -140,6 +151,11 @@ struct json_object *ws_execute(struct json_object *rq)
 		free(err);
 	}
 
+	log_debug("ws_execute() unlock");
+	pthread_mutex_unlock(lock);
+
+	log_debug("ws_execute()");
+
 	return result;
 }
 
@@ -199,12 +215,13 @@ int ws_open_session()
 	if (session_id)
 		free(session_id);
 
+	session_id = NULL;
 	session_id = ws_login();
 
 	if (session_id) {
 		version = ws_get_api_version();
 		log_debug("API version= %d", version);
-
+		
 		if (version > 0) {
 			result = 1;
 		} else {
@@ -212,6 +229,7 @@ int ws_open_session()
 			session_id = NULL;
 			result = 0;
 		}
+		result = 1;
 	} else {
 		result =  0;
 	}
@@ -256,6 +274,7 @@ int ws_update_headlines(struct feed *feed)
 
 	rq = ws_request_new("getHeadlines");
 	ws_request_add_att_int(rq, "feed_id", feed->id);
+	ws_request_add_att_bool(rq, "show_excerpt", 1);
 
 	rp = ws_execute(rq);
 
@@ -279,6 +298,10 @@ int ws_update_headlines(struct feed *feed)
 
 				h = headline_new(hid, url, title);
 
+				j = json_object_object_get(jheadline,
+							   "excerpt");
+				h->excerpt = strdup(json_object_get_string(j));
+
 				tmp = headlines_add(feed->headlines, h);
 				if (feed->headlines)
 					free(feed->headlines);
@@ -348,18 +371,26 @@ struct feed **ws_update_feeds(struct feed **feeds)
 	return feeds;
 }
 
-void ws_set_article_unread(int id, int unread)
+struct json_object *ws_request_new_set_article_unread(int id, int unread)
 {
-	struct json_object *rp, *rq;
-
-
-	log_debug("ws_set_article_unread(%d,%d)", id, unread);
+	struct json_object *rq;
 
 	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));
 
+	return rq;
+}
+
+void ws_set_article_unread(int id, int unread)
+{
+	struct json_object *rp, *rq;
+
+	log_debug("ws_set_article_unread(%d,%d)", id, unread);
+
+	rq = ws_request_new_set_article_unread(id, unread);
+
 	rp = ws_execute(rq);
 
 	json_object_put(rq);
@@ -369,3 +400,12 @@ void ws_set_article_unread(int id, int unread)
 
 	log_debug("ws_set_article_unread(%d,%d) done", id, unread);
 }
+
+void ws_init()
+{
+	pthread_mutexattr_t    attr;
+
+	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+	lock = malloc(sizeof(pthread_mutex_t));
+	pthread_mutex_init(lock, &attr);
+}