X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fttrss.c;h=64a037563fb4b73239a6a191fac379f24abefef0;hb=48e7c0631ee3371b5cf6503417b4ec1c2b733176;hp=2a94e99bf3f60e063c667f306d667751d82f89a6;hpb=2acb4f4b249348eeb6ca4bf37836889be55418ff;p=prss.git diff --git a/src/ttrss.c b/src/ttrss.c index 2a94e99..64a0375 100644 --- a/src/ttrss.c +++ b/src/ttrss.c @@ -21,277 +21,61 @@ #include #include -#include -#include "phttp.h" -#include "ttrss.h" +#include "http.h" +#include "ttrss_ws.h" #include "url.h" -static char *session_id; -static char *session_url; - -static struct json_object *create_op(const char *op) -{ - struct json_object *j; - - j = json_object_new_object(); - json_object_object_add(j, "op", json_object_new_string(op)); - - if (session_id && strcmp(op, "login")) - json_object_object_add(j, - "sid", - json_object_new_string(session_id)); - - return j; -} - -void ttrss_login(const char *url, const char *user, const char *password) -{ - struct json_object *content, *rp, *error, *sid, *rq; - char *tmp; - - if (session_url) - free(session_url); - - tmp = url_normalize(url); - session_url = malloc(strlen(tmp) + strlen("/api/") + 1); - strcpy(session_url, tmp); - strcat(session_url, "/api/"); - free(tmp); - - - rq = create_op("login"); - json_object_object_add(rq, "user", json_object_new_string(user)); - json_object_object_add(rq, - "password", - json_object_new_string(password)); - - rp = post_json_object(session_url, rq); - json_object_put(rq); - - content = json_object_object_get(rp, "content"); - if (!content) { - fprintf(stderr, "Login failed: no content\n"); - return ; - } - - error = json_object_object_get(content, "error"); - if (error) { - fprintf(stderr, "Login failed\n"); - return ; - } - - sid = json_object_object_get(content, "session_id"); - - if (session_id) { - free(session_id); - session_id = NULL; - } - - session_id = strdup(json_object_get_string(sid)); - - printf("Session id: %s\n", session_id); - - json_object_put(rp); -} +static struct feed **data; const char *ttrss_get_headline_content(struct headline *h) { - struct json_object *rp, *rq, *content, *array, *item; - - printf("get_headlines %d\n", h->id); - - if (!h->content) { - rq = create_op("getArticle"); - json_object_object_add(rq, "article_id", - json_object_new_int(h->id)); - - rp = post_json_object(session_url, rq); - - json_object_put(rq); - - array = json_object_object_get(rp, "content"); - - if (!array) - goto release; - - item = json_object_array_get_idx(array, 0); - - if (!item) - goto release; + if (!h->content) + h->content = ws_get_article_content(h->id); - content = json_object_object_get(item, "content"); - - h->content = strdup(json_object_get_string(content)); - - release: - json_object_put(rp); - } return h->content; } -static struct headline **get_headlines(int feed_id) -{ - struct json_object *rp, *rq, *content, *jheadline, *j; - int i, n; - struct headline **headlines, *h; - - printf("get_headlines %d\n", feed_id); - - rq = create_op("getHeadlines"); - json_object_object_add(rq, "feed_id", json_object_new_int(feed_id)); - - rp = post_json_object(session_url, rq); - - json_object_put(rq); - - content = json_object_object_get(rp, "content"); - - if (content) { - n = json_object_array_length(content); - headlines = malloc((n+1)*sizeof(struct headline *)); - for (i = 0; i < n; i++) { - jheadline = json_object_array_get_idx(content, i); - - h = malloc(sizeof(struct headline)); - - j = json_object_object_get(jheadline, "id"); - h->id = json_object_get_int(j); - - j = json_object_object_get(jheadline, "title"); - h->title = strdup(json_object_get_string(j)); - - j = json_object_object_get(jheadline, "link"); - h->url = strdup(json_object_get_string(j)); - - h->excerpt = NULL; - h->content = NULL; - - j = json_object_object_get(jheadline, "unread"); - h->unread = json_object_get_boolean(j); - - headlines[i] = h; - } - headlines[n] = NULL; - } else { - headlines = NULL; - } - - json_object_put(rp); - - printf("get_headlines %d end\n", feed_id); - - return headlines; -} - -static int feeds_length(struct feed **list) -{ - int n; - - if (!list) - return 0; - - n = 0; - while(*list) { - n++; - list++; - } - - return n; -} - -static struct feed **feeds_add(struct feed **feeds, struct feed *feed) -{ - int n; - struct feed **result; - - n = feeds_length(feeds); - - result = malloc((n + 1 + 1) * sizeof(struct feed *)); - - if (feeds) - memcpy(result, feeds, n * sizeof(struct feed *)); - - result[n] = feed; - result[n + 1] = NULL; - - return result; -} - struct feed **ttrss_get_feeds() { - struct json_object *rp, *rq, *content, *jfeed, *j; - int i, n; - struct feed **feeds, *feed, **tmp; - - printf("ttrss_get_feeds\n"); - - rq = create_op("getFeeds"); - - rp = post_json_object(session_url, rq); - json_object_put(rq); - - content = json_object_object_get(rp, "content"); - - if (content) { - n = json_object_array_length(content); - - feeds = NULL; - for (i = 0; i < n; i++) { - jfeed = json_object_array_get_idx(content, i); - - feed = malloc(sizeof(struct feed)); - - j = json_object_object_get(jfeed, "title"); - feed->title = strdup(json_object_get_string(j)); - - j = json_object_object_get(jfeed, "feed_url"); - feed->url = strdup(json_object_get_string(j)); - - j = json_object_object_get(jfeed, "id"); - feed->id = json_object_get_int(j); - - j = json_object_object_get(jfeed, "unread"); - feed->unread = json_object_get_int(j); - - feed->headlines = NULL; - - tmp = feeds_add(feeds, feed); - free(feeds); - feeds = tmp; - } - } else { - feeds = NULL; - } + data = ws_update_feeds(data); - json_object_put(rp); - - printf("ttrss_get_feeds ended\n"); - - return feeds; + return data; } -struct headline **ttrss_get_headlines(struct feed *f) +struct headline **ttrss_feed_get_headlines(struct feed *f) { if (!f->headlines) - f->headlines = get_headlines(f->id); + ws_update_headlines(f); return f->headlines; } void ttrss_set_article_unread(int id, int unread) -{ +{ struct json_object *rp, *rq; printf("ttrss_set_article_unread %d %d\n", id, unread); - rq = create_op("updateArticle"); + 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)); - rp = post_json_object(session_url, rq); - + rp = ws_execute(rq); + json_object_put(rq); json_object_put(rp); } + +void ttrss_set_config(const char *url, const char *user, const char *pwd) +{ + feeds_free(data); + data = NULL; + ws_init(url, user, pwd); +} + +struct feed *ttrss_get_feed(int id) +{ + return feeds_get_feed(data, id); +}