fixed code style

[prss.git] / src / ttrss_ws.c

diff --git a/src/ttrss_ws.c b/src/ttrss_ws.c
index c4c2c4f..e9680f4 100644 (file)
--- a/src/ttrss_ws.c
+++ b/src/ttrss_ws.c
@@ -95,23 +95,25 @@ 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");
+       log_debug("ws_reply_get_content");
        return json_object_object_get(rp, "content");
 }
 
 static const char *ws_reply_get_error(struct json_object *content)
 {
-        struct json_object *jerror;
+       struct json_object *jerror;
 
-        if (json_object_get_type(content) != json_type_object)
-                return NULL;
+       log_debug("ws_reply_get_error");
 
-        jerror = json_object_object_get(content, "error");
-        
-        if (!jerror)
-                return NULL;
+       if (json_object_get_type(content) != json_type_object)
+               return NULL;
 
-        return json_object_get_string(jerror);                
+       jerror = json_object_object_get(content, "error");
+
+       if (!jerror)
+               return NULL;
+
+       return json_object_get_string(jerror);
 }
 
 static struct json_object *
@@ -128,19 +130,24 @@ execute(struct http_session *sess, struct json_object *rq, char **err)
                content = ws_reply_get_content(rp);
 
                if (content) {
-                        str = ws_reply_get_error(content);
+                       str = ws_reply_get_error(content);
 
                        if (str) {
-                                *err = strdup(str);
+                               log_debug("execute() err=%s", str);
                                content = NULL;
+
+                               if (err)
+                                       *err = strdup(str);
                        } else {
-                                json_object_get(content);
+                               json_object_get(content);
                        }
                }
 
                json_object_put(rp);
        }
 
+       log_debug("execute() done");
+
        return content;
 }
 
@@ -245,7 +252,6 @@ int ws_open_session()
                        session_id = NULL;
                        result = 0;
                }
-               result = 1;
        } else {
                result =  0;
        }
@@ -253,32 +259,56 @@ int ws_open_session()
        return result;
 }
 
-char *ws_get_article_content(int id)
+struct json_object *ws_request_new_get_article_content(int id)
 {
-       struct json_object *rp, *rq, *content, *item;
-       char *str;
+       struct json_object *rq;
 
        rq = ws_request_new("getArticle");
        ws_request_add_att_int(rq, "article_id", id);
 
-       rp = ws_execute(rq);
-
-       json_object_put(rq);
+       return rq;
+}
 
-       str = NULL;
+const char *ws_reply_get_article_content(struct json_object *rp)
+{
+       struct json_object *item, *content;
 
        if (rp) {
                item = json_object_array_get_idx(rp, 0);
 
                if (item) {
                        content = json_object_object_get(item, "content");
-                       str = strdup(json_object_get_string(content));
+                       return json_object_get_string(content);
                }
+       }
 
-               json_object_put(rp);
+       return NULL;
+}
+
+char *ws_get_article_content(int id)
+{
+       struct json_object *rp, *rq;
+       const char *content;
+       char *str;
+
+       rq = ws_request_new("getArticle");
+       ws_request_add_att_int(rq, "article_id", id);
+
+       rp = ws_execute(rq);
+
+       json_object_put(rq);
+
+       if (rp) {
+               content = ws_reply_get_article_content(rp);
+
+               if (content) {
+                       str = strdup(content);
+                       json_object_put(rp);
+                       return str;
+               }
        }
 
-       return str;
+       return NULL;
 }
 
 int ws_update_headlines(struct feed *feed)
@@ -290,7 +320,6 @@ 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);
 
@@ -315,10 +344,6 @@ 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);
 
@@ -331,6 +356,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 {
@@ -338,30 +369,23 @@ 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);
-                        
+
                        feed = feeds_get_feed(feeds, id);
 
                        if (!feed) {
@@ -383,10 +407,34 @@ struct feed **ws_update_feeds(struct feed **feeds)
 
                        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");