(no commit message)

[prss.git] / src / ttrss_ws.c

diff --git a/src/ttrss_ws.c b/src/ttrss_ws.c
index 82e9205..3aa4959 100644 (file)
--- 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;
@@ -57,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;
 
@@ -88,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()
@@ -151,22 +196,25 @@ char *ws_login()
                        str = strdup(json_object_get_string(j));
 
                json_object_put(rp);
-       } 
+       }
 
        return str;
 }
 
 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();
+               /*version = ws_get_api_version();
                log_debug("API version= %d", version);
 
                if (version > 0) {
@@ -175,7 +223,8 @@ int ws_open_session()
                        free(session_id);
                        session_id = NULL;
                        result = 0;
-               }
+                       }*/
+               result = 1;
        } else {
                result =  0;
        }
@@ -266,7 +315,7 @@ struct feed **ws_update_feeds(struct feed **feeds)
        struct feed *feed, **tmp;
        const char *title, *url;
 
-       log_debug("ttrss_get_feeds()");
+       log_debug("ws_update_feeds()");
 
        rq = ws_request_new("getFeeds");
 
@@ -307,7 +356,46 @@ struct feed **ws_update_feeds(struct feed **feeds)
                feeds = NULL;
        }
 
-       log_debug("ttrss_get_feeds() done");
+       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);
+}