X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fttrss.c;h=db573979d176b00d822f7640ec3e1c26f9e86d26;hp=97f28038b234cd18d1ccecb8605372e0de159b7b;hb=fcf65b0583b22e6aafe3333d4869d652e780a455;hpb=a0736fce0f13ccf8ae96f00b5ed65af316c7571a diff --git a/src/ttrss.c b/src/ttrss.c index 97f2803..db57397 100644 --- a/src/ttrss.c +++ b/src/ttrss.c @@ -18,347 +18,87 @@ */ #include +#include #include +#include #include #include "http.h" -#include "ttrss.h" +#include "io.h" +#include "ttrss_ws.h" #include "url.h" -static char *session_id; -static char *session_url; -static char *session_user; -static char *session_pwd; +static struct feed **data; +static char *cache_dir; -void ws_request_add_att_str(json_object *rq, const char *k, const char *str) +static const char *get_cache_dir() { - json_object_object_add(rq, k, json_object_new_string(str)); -} - -void ws_request_add_att_int(json_object *rq, const char *k, int v) -{ - json_object_object_add(rq, k, json_object_new_int(v)); -} - -struct json_object *ws_request_new(const char *op) -{ - struct json_object *rq; - - rq = json_object_new_object(); - - ws_request_add_att_str(rq, "op", op); - - if (session_id) - ws_request_add_att_str(rq, "sid", session_id); - - return rq; -} - -void ws_init(const char *url, const char *user, const char *pwd) -{ - char *tmp; - - if (session_id) - session_id = NULL; - - if (session_user) - free(session_user); - session_user = strdup(user); - - if (session_pwd) - free(session_pwd); - session_pwd = strdup(pwd); - - 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); -} - -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) -{ - struct json_object *rp, *content; - - rp = http_json_get(session_url, rq); - - 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; - } - - json_object_put(rp); - } - - return NULL; -} - -int ws_get_api_version() -{ - struct json_object *rp, *rq; - int v; + char *home; - rq = ws_request_new("getApiLevel"); - - rp = ws_execute(rq); - - json_object_put(rq); + if (!cache_dir) { + home = getenv("HOME"); - if (rp) { - v = json_object_get_int(json_object_object_get(rp, "level")); + if (!home) + return NULL; - json_object_put(rp); - } else { - v = 0; + cache_dir = path_append(home, ".prss/cache"); + mkdirs(cache_dir, 0777); } - return v; + return cache_dir; } -char *ws_login() +static void file_set_content(const char *path, const char *content) { - struct json_object *rq, *rp, *j; - char *str; + FILE *fp; - rq = ws_request_new("login"); - ws_request_add_att_str(rq, "user", session_user); - ws_request_add_att_str(rq, "password", session_pwd); - - rp = ws_execute(rq); - json_object_put(rq); - - if (rp) { - j = json_object_object_get(rp, "session_id"); - str = strdup(json_object_get_string(j)); - - json_object_put(rp); - } else { - str = NULL; + fp = fopen(path, "w"); + if (fp) { + fwrite(content, 1, strlen(content), fp); + fclose(fp); } - - return str; -} - -int ws_open_session() -{ - int version, result; - - if (session_id) - free(session_id); - - session_id = ws_login(); - - if (session_id) { - version = ws_get_api_version(); - printf("API version: %d\n", version); - - if (version > 0) { - result = 1; - } else { - free(session_id); - session_id = NULL; - result = 0; - } - } else { - result = 0; - } - - return result; } const char *ttrss_get_headline_content(struct headline *h) { - struct json_object *rp, *rq, *content, *array, *item; - - printf("get_headlines %d\n", h->id); + const char *cache_dir; + char *path, *content; if (!h->content) { - rq = ws_request_new("getArticle"); - json_object_object_add(rq, "article_id", - json_object_new_int(h->id)); - - rp = http_json_get(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; - - 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 = ws_request_new("getHeadlines"); - json_object_object_add(rq, "feed_id", json_object_new_int(feed_id)); - - rp = http_json_get(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)); + cache_dir = get_cache_dir(); + if (cache_dir) { + path = g_strdup_printf("%s/%d", cache_dir, h->id); - j = json_object_object_get(jheadline, "id"); - h->id = json_object_get_int(j); + content = file_get_content(path); - j = json_object_object_get(jheadline, "title"); - h->title = strdup(json_object_get_string(j)); + if (content) { + h->content = content; + } else { + h->content = ws_get_article_content(h->id); - j = json_object_object_get(jheadline, "link"); - h->url = strdup(json_object_get_string(j)); + if (h->content) + file_set_content(path, h->content); + } - h->excerpt = NULL; - h->content = NULL; - - j = json_object_object_get(jheadline, "unread"); - h->unread = json_object_get_boolean(j); - - headlines[i] = h; + g_free(path); } - 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; + return h->content; } 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 = ws_request_new("getFeeds"); - - rp = http_json_get(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); + data = ws_update_feeds(data); - 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; - } - - 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; } @@ -374,8 +114,25 @@ void ttrss_set_article_unread(int id, int unread) json_object_object_add(rq, "field", json_object_new_int(2)); json_object_object_add(rq, "mode", json_object_new_int(unread)); - rp = http_json_get(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); +} + +struct headline *ttrss_get_headline(int id) +{ + return feeds_get_headline(data, id); +}