X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fttrss_ws.c;h=582f9fbab2c8407fc18ba3ff51113f7c57980737;hp=3aa49593dd7b6e868436f2d068e39b5c0807e2c8;hb=05d4d920a38f57f2afc0ef349d8f4c96a5852878;hpb=40d30b549ad41af63da74a3c7cb36db7f5e089e7

diff --git a/src/ttrss_ws.c b/src/ttrss_ws.c
index 3aa4959..582f9fb 100644
--- a/src/ttrss_ws.c
+++ b/src/ttrss_ws.c
@@ -30,13 +30,14 @@
 #include "ttrss_ws.h"
 #include "url.h"
 
-static pthread_mutex_t *lock;
-
 static char *session_id;
 static char *session_url;
 static char *session_user;
 static char *session_pwd;
 
+static pthread_mutex_t lock;
+static struct http_session *session;
+
 void ws_request_add_att_str(json_object *rq, const char *k, const char *str)
 {
 	json_object_object_add(rq, k, json_object_new_string(str));
@@ -47,6 +48,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;
@@ -92,12 +98,13 @@ struct json_object *ws_reply_get_content(struct json_object *rp)
 	return json_object_object_get(rp, "content");
 }
 
-static struct json_object *execute(struct json_object *rq, char **err)
+static struct json_object *
+execute(struct http_session *sess, struct json_object *rq, char **err)
 {
 	struct json_object *rp, *content, *jerror;
 	const char *str;
 
-	rp = http_json_get(session_url, rq);
+	rp = http_json_get(sess, session_url, rq);
 
 	content = NULL;
 
@@ -129,25 +136,25 @@ struct json_object *ws_execute(struct json_object *rq)
 	struct json_object *result;
 
 	log_debug("ws_execute()");
-	pthread_mutex_lock(lock);
+	pthread_mutex_lock(&lock);
 	log_debug("ws_execute() lock");
 
 	err = NULL;
-	result = execute(rq, &err);
+	result = execute(session, rq, &err);
 
 	if (err) {
 		log_debug("ws_execute(): error=%s\n", err);
 
 		if (!strcmp(err, "NOT_LOGGED_IN")) {
 			ws_open_session();
-			result = execute(rq, NULL);
+			result = execute(session, rq, NULL);
 		}
 
 		free(err);
 	}
 
 	log_debug("ws_execute() unlock");
-	pthread_mutex_unlock(lock);
+	pthread_mutex_unlock(&lock);
 
 	log_debug("ws_execute()");
 
@@ -203,7 +210,7 @@ char *ws_login()
 
 int ws_open_session()
 {
-	int /*version, */result;
+	int version, result;
 
 	log_debug("ws_open_session()");
 
@@ -214,7 +221,7 @@ int ws_open_session()
 	session_id = ws_login();
 
 	if (session_id) {
-		/*version = ws_get_api_version();
+		version = ws_get_api_version();
 		log_debug("API version= %d", version);
 
 		if (version > 0) {
@@ -223,7 +230,7 @@ int ws_open_session()
 			free(session_id);
 			session_id = NULL;
 			result = 0;
-			}*/
+		}
 		result = 1;
 	} else {
 		result =  0;
@@ -269,6 +276,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);
 
@@ -292,6 +300,14 @@ 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));
+
+				j = json_object_object_get(jheadline,
+							   "updated");
+				h->date = json_object_get_int(j);
+
 				tmp = headlines_add(feed->headlines, h);
 				if (feed->headlines)
 					free(feed->headlines);
@@ -349,6 +365,8 @@ struct feed **ws_update_feeds(struct feed **feeds)
 
 			j = json_object_object_get(jfeed, "unread");
 			feed->unread = json_object_get_int(j);
+
+			ws_update_headlines(feed);
 		}
 		json_object_put(rp);
 	} else {
@@ -393,9 +411,9 @@ void ws_set_article_unread(int id, int unread)
 
 void ws_init()
 {
-	pthread_mutexattr_t    attr;
-
+	pthread_mutexattr_t attr;
 	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-	lock = malloc(sizeof(pthread_mutex_t));
-	pthread_mutex_init(lock, &attr);
+	pthread_mutex_init(&lock, &attr);
+
+	session = http_session_new();
 }