(no commit message)

[prss.git] / src / ttrss_ws.c

diff --git a/src/ttrss_ws.c b/src/ttrss_ws.c
index 94f0fee..8ec1746 100644 (file)
--- a/src/ttrss_ws.c
+++ b/src/ttrss_ws.c
@@ -88,25 +88,59 @@ 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()");
+
+       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);
+       }
+
+       return result;
 }
 
 int ws_get_api_version()
@@ -151,7 +185,7 @@ char *ws_login()
                        str = strdup(json_object_get_string(j));
 
                json_object_put(rp);
-       } 
+       }
 
        return str;
 }
@@ -160,6 +194,8 @@ int ws_open_session()
 {
        int version, result;
 
+       log_debug("ws_open_session()");
+
        if (session_id)
                free(session_id);
 
@@ -315,7 +351,8 @@ struct feed **ws_update_feeds(struct feed **feeds)
 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("updateArticle");