X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fttrss_ws.c;h=51eee15d482e2bb82bbb9081f03575f5a7ec2c20;hp=94f0feee6324d7a0e8bc868f4cde024117ffe281;hb=5bb795e97e53ef92cb7b28ee3598ad2aa4ec65d3;hpb=95162b13ecc70395c10d3cf79757affe6d0c00cf

diff --git a/src/ttrss_ws.c b/src/ttrss_ws.c
index 94f0fee..51eee15 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 *http_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;
 
@@ -88,25 +98,66 @@ struct json_object *ws_reply_get_content(struct json_object *rp)
 	return json_object_object_get(rp, "content");
 }
 
-struct json_object *ws_execute(struct json_object *rq)
+static struct json_object *execute(struct json_object *rq, char **err)
 {
-	struct json_object *rp, *content;
+	struct json_object *rp, *content, *jerror;
+	const char *str;
+
+	rp = http_json_get(http_session, session_url, rq);
 
-	rp = http_json_get(session_url, rq);
+	content = NULL;
 
 	if (rp) {
 		content = ws_reply_get_content(rp);
 
-		if (content && !json_object_object_get(rp, "error")) {
-			json_object_get(content);
-			json_object_put(rp);
-			return content;
+		if (content) {
+			jerror = json_object_object_get(content, "error");
+			if (jerror) {
+				if (err) {
+					str = json_object_get_string(jerror);
+					*err = strdup(str);
+				}
+				content = NULL;
+			} else {
+				json_object_get(content);
+			}
 		}
 
 		json_object_put(rp);
 	}
 
-	return NULL;
+	return content;
+}
+
+struct json_object *ws_execute(struct json_object *rq)
+{
+	char *err;
+	struct json_object *result;
+
+	log_debug("ws_execute()");
+	pthread_mutex_lock(&lock);
+	log_debug("ws_execute() lock");
+
+	err = NULL;
+	result = execute(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);
+		}
+
+		free(err);
+	}
+
+	log_debug("ws_execute() unlock");
+	pthread_mutex_unlock(&lock);
+
+	log_debug("ws_execute()");
+
+	return result;
 }
 
 int ws_get_api_version()
@@ -151,7 +202,7 @@ char *ws_login()
 			str = strdup(json_object_get_string(j));
 
 		json_object_put(rp);
-	} 
+	}
 
 	return str;
 }
@@ -160,9 +211,12 @@ int ws_open_session()
 {
 	int version, result;
 
+	log_debug("ws_open_session()");
+
 	if (session_id)
 		free(session_id);
 
+	session_id = NULL;
 	session_id = ws_login();
 
 	if (session_id) {
@@ -176,6 +230,7 @@ int ws_open_session()
 			session_id = NULL;
 			result = 0;
 		}
+		result = 1;
 	} else {
 		result =  0;
 	}
@@ -220,6 +275,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);
 
@@ -243,6 +299,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);
@@ -312,17 +376,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);
@@ -332,3 +405,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);
+
+	http_session = http_session_new();
+}