(no commit message)

[prss.git] / src / ttrss_ws.c

diff --git a/src/ttrss_ws.c b/src/ttrss_ws.c
index 51eee15..1d52696 100644 (file)
--- a/src/ttrss_ws.c
+++ b/src/ttrss_ws.c
@@ -36,7 +36,7 @@ static char *session_user;
 static char *session_pwd;
 
 static pthread_mutex_t lock;
-static struct http_session *http_session;
+static struct http_session *session;
 
 void ws_request_add_att_str(json_object *rq, const char *k, const char *str)
 {
@@ -95,15 +95,34 @@ void ws_set_config(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 *rp, *content, *jerror;
+       struct json_object *jerror;
+
+       log_debug("ws_reply_get_error");
+
+       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;
        const char *str;
 
-       rp = http_json_get(http_session, session_url, rq);
+       rp = http_json_get(sess, session_url, rq);
 
        content = NULL;
 
@@ -111,12 +130,11 @@ 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) {
+                               log_debug("execute() err=%s", str);
+                               *err = strdup(str);
                                content = NULL;
                        } else {
                                json_object_get(content);
@@ -126,6 +144,8 @@ static struct json_object *execute(struct json_object *rq, char **err)
                json_object_put(rp);
        }
 
+       log_debug("execute() done");
+
        return content;
 }
 
@@ -139,14 +159,14 @@ struct json_object *ws_execute(struct json_object *rq)
        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);
@@ -230,7 +250,6 @@ int ws_open_session()
                        session_id = NULL;
                        result = 0;
                }
-               result = 1;
        } else {
                result =  0;
        }
@@ -316,6 +335,12 @@ int ws_update_headlines(struct feed *feed)
                        j = json_object_object_get(jheadline, "unread");
                        h->unread = json_object_get_boolean(j);
                }
+
+               if (!feed->headlines) {
+                       feed->headlines = malloc(sizeof(struct headline *));
+                       *(feed->headlines) = NULL;
+               }
+
                json_object_put(rp);
                return 1;
        } else {
@@ -323,25 +348,19 @@ int ws_update_headlines(struct feed *feed)
        }
 }
 
-struct feed **ws_update_feeds(struct feed **feeds)
+static struct feed **
+feeds_update(struct feed **feeds, struct json_object *jarray)
 {
-       struct json_object *rp, *rq, *jfeed, *j;
        int i, n, id;
+       struct json_object *jfeed, *j;
+       const char *url, *title;
        struct feed *feed, **tmp;
-       const char *title, *url;
-
-       log_debug("ws_update_feeds()");
-
-       rq = ws_request_new("getFeeds");
 
-       rp = ws_execute(rq);
-       json_object_put(rq);
-
-       if (rp) {
-               n = json_object_array_length(rp);
+       if (jarray) {
+               n = json_object_array_length(jarray);
 
                for (i = 0; i < n; i++) {
-                       jfeed = json_object_array_get_idx(rp, i);
+                       jfeed = json_object_array_get_idx(jarray, i);
 
                        j = json_object_object_get(jfeed, "id");
                        id = json_object_get_int(j);
@@ -364,11 +383,37 @@ 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);
                }
+       }
+
+       return feeds;
+}
+
+struct feed **ws_update_feeds(struct feed **feeds)
+{
+       struct json_object *rp, *rq;
+
+       log_debug("ws_update_feeds()");
+
+       rq = ws_request_new("getFeeds");
+       ws_request_add_att_int(rq, "cat_id", 0);
+
+       rp = ws_execute(rq);
+
+       if (rp) {
+               feeds = feeds_update(feeds, rp);
+               json_object_put(rp);
+       }
+
+       ws_request_add_att_int(rq, "cat_id", -3);
+       rp = ws_execute(rq);
+       json_object_put(rq);
+
+       if (rp) {
+               feeds = feeds_update(feeds, rp);
                json_object_put(rp);
-       } else {
-               feeds_free(feeds);
-               feeds = NULL;
        }
 
        log_debug("ws_update_feeds() done");
@@ -412,5 +457,5 @@ void ws_init()
        pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
        pthread_mutex_init(&lock, &attr);
 
-       http_session = http_session_new();
+       session = http_session_new();
 }