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

diff --git a/src/ttrss_ws.c b/src/ttrss_ws.c
index cdd7296..3aa4959 100644
--- a/src/ttrss_ws.c
+++ b/src/ttrss_ws.c
@@ -17,16 +17,21 @@
  * 02110-1301 USA
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
+
+#include <pthread.h>
 
 #include <json/json.h>
 
 #include "http.h"
+#include "log.h"
 #include "ttrss_ws.h"
 #include "url.h"
 
+static pthread_mutex_t *lock;
+
 static char *session_id;
 static char *session_url;
 static char *session_user;
@@ -56,7 +61,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;
 
@@ -87,25 +92,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(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()
@@ -142,13 +188,14 @@ char *ws_login()
 	rp = ws_execute(rq);
 	json_object_put(rq);
 
+	str = NULL;
 	if (rp) {
 		j = json_object_object_get(rp, "session_id");
-		str = strdup(json_object_get_string(j));
+
+		if (j)
+			str = strdup(json_object_get_string(j));
 
 		json_object_put(rp);
-	} else {
-		str = NULL;
 	}
 
 	return str;
@@ -156,16 +203,19 @@ char *ws_login()
 
 int ws_open_session()
 {
-	int version, result;
+	int /*version, */result;
+
+	log_debug("ws_open_session()");
 
 	if (session_id)
 		free(session_id);
 
+	session_id = NULL;
 	session_id = ws_login();
 
 	if (session_id) {
-		version = ws_get_api_version();
-		printf("API version: %d\n", version);
+		/*version = ws_get_api_version();
+		log_debug("API version= %d", version);
 
 		if (version > 0) {
 			result = 1;
@@ -173,7 +223,8 @@ int ws_open_session()
 			free(session_id);
 			session_id = NULL;
 			result = 0;
-		}
+			}*/
+		result = 1;
 	} else {
 		result =  0;
 	}
@@ -212,7 +263,7 @@ char *ws_get_article_content(int id)
 int ws_update_headlines(struct feed *feed)
 {
 	struct json_object *rp, *rq, *jheadline, *j;
-	int i, n, err, hid;
+	int i, n, hid;
 	struct headline *h, **tmp;
 	const char *title, *url;
 
@@ -250,13 +301,11 @@ int ws_update_headlines(struct feed *feed)
 			j = json_object_object_get(jheadline, "unread");
 			h->unread = json_object_get_boolean(j);
 		}
-		err = 0;
+		json_object_put(rp);
+		return 1;
 	} else {
-		err = 1;
+		return 0;
 	}
-
-	json_object_put(rp);
-	return !err;
 }
 
 struct feed **ws_update_feeds(struct feed **feeds)
@@ -266,7 +315,7 @@ struct feed **ws_update_feeds(struct feed **feeds)
 	struct feed *feed, **tmp;
 	const char *title, *url;
 
-	printf("ttrss_get_feeds\n");
+	log_debug("ws_update_feeds()");
 
 	rq = ws_request_new("getFeeds");
 
@@ -296,21 +345,57 @@ struct feed **ws_update_feeds(struct feed **feeds)
 				tmp = feeds_add(feeds, feed);
 				free(feeds);
 				feeds = tmp;
-			} else {
-				printf("found!\n");
 			}
 
 			j = json_object_object_get(jfeed, "unread");
 			feed->unread = json_object_get_int(j);
 		}
+		json_object_put(rp);
 	} else {
 		feeds_free(feeds);
 		feeds = NULL;
 	}
 
-	json_object_put(rp);
-
-	printf("ttrss_get_feeds ended\n");
+	log_debug("ws_update_feeds() done");
 
 	return feeds;
 }
+
+struct json_object *ws_request_new_set_article_unread(int id, int 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);
+
+	if (rp)
+		json_object_put(rp);
+
+	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);
+}