X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fttrss_ws.c;h=c4c2c4f096660e8923ea4d203e4c86556e4bd3ad;hp=267b129a3e5f2621a5b6f31d7d158f84b1c8ab45;hb=111ccdc319c9f80ef4350b4b07408144a5684229;hpb=f93956db82f2d478b1a3dfd34d3fe024d4afd636

diff --git a/src/ttrss_ws.c b/src/ttrss_ws.c
index 267b129..c4c2c4f 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>
 
@@ -33,6 +35,9 @@ 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));
@@ -43,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;
@@ -57,7 +67,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;
 
@@ -85,15 +95,32 @@ void ws_init(const char *url, const char *user, const char *pwd)
 
 struct json_object *ws_reply_get_content(struct json_object *rp)
 {
+        log_debug("ws_reply_get_content");
 	return json_object_object_get(rp, "content");
 }
 
-static struct json_object *execute(struct json_object *rq, char **err)
+static const char *ws_reply_get_error(struct json_object *content)
+{
+        struct json_object *jerror;
+
+        if (json_object_get_type(content) != json_type_object)
+                return NULL;
+
+        jerror = json_object_object_get(content, "error");
+        
+        if (!jerror)
+                return NULL;
+
+        return json_object_get_string(jerror);                
+}
+
+static struct json_object *
+execute(struct http_session *sess, struct json_object *rq, char **err)
 {
-	struct json_object *rp, *content, *jerror;
+	struct json_object *rp, *content;
 	const char *str;
 
-	rp = http_json_get(session_url, rq);
+	rp = http_json_get(sess, session_url, rq);
 
 	content = NULL;
 
@@ -101,15 +128,13 @@ static struct json_object *execute(struct json_object *rq, char **err)
 		content = ws_reply_get_content(rp);
 
 		if (content) {
-			jerror = json_object_object_get(content, "error");
-			if (jerror) {
-				if (err) {
-					str = json_object_get_string(jerror);
-					*err = strdup(str);
-				}
+                        str = ws_reply_get_error(content);
+
+			if (str) {
+                                *err = strdup(str);
 				content = NULL;
 			} else {
-				json_object_get(content);
+                                json_object_get(content);
 			}
 		}
 
@@ -125,21 +150,28 @@ 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);
+	result = execute(session, rq, &err);
 
 	if (err) {
-		log_debug("ws_execute(): error=%s\n", err);
+		log_debug("ws_execute(): error=%s", 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);
+
+	log_debug("ws_execute()");
+
 	return result;
 }
 
@@ -213,6 +245,7 @@ int ws_open_session()
 			session_id = NULL;
 			result = 0;
 		}
+		result = 1;
 	} else {
 		result =  0;
 	}
@@ -257,6 +290,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);
 
@@ -280,6 +314,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);
@@ -308,6 +350,7 @@ struct feed **ws_update_feeds(struct feed **feeds)
 	rq = ws_request_new("getFeeds");
 
 	rp = ws_execute(rq);
+
 	json_object_put(rq);
 
 	if (rp) {
@@ -318,7 +361,7 @@ struct feed **ws_update_feeds(struct feed **feeds)
 
 			j = json_object_object_get(jfeed, "id");
 			id = json_object_get_int(j);
-
+                        
 			feed = feeds_get_feed(feeds, id);
 
 			if (!feed) {
@@ -337,6 +380,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 {
@@ -378,3 +423,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);
+	pthread_mutex_init(&lock, &attr);
+
+	session = http_session_new();
+}