X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fttrss_ws.c;h=e9680f4850fea6010f3fbe08fda7f405cf93799d;hp=f34aaf1b04688c30f2ca02b954966809bddcfe2e;hb=03759c1d9512afb87624c268481d5c9c499e8275;hpb=09a826a93753ebb1b82fbc30574c034f084e02b8 diff --git a/src/ttrss_ws.c b/src/ttrss_ws.c index f34aaf1..e9680f4 100644 --- a/src/ttrss_ws.c +++ b/src/ttrss_ws.c @@ -17,9 +17,11 @@ * 02110-1301 USA */ +#include #include #include -#include + +#include #include @@ -33,6 +35,9 @@ static char *session_url; static char *session_user; static char *session_pwd; +static pthread_mutex_t lock; +static struct http_session *session; + void ws_request_add_att_str(json_object *rq, const char *k, const char *str) { json_object_object_add(rq, k, json_object_new_string(str)); @@ -43,6 +48,11 @@ 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)); } +void ws_request_add_att_bool(json_object *rq, const char *k, int v) +{ + json_object_object_add(rq, k, json_object_new_boolean(v)); +} + struct json_object *ws_request_new(const char *op) { struct json_object *rq; @@ -57,7 +67,7 @@ struct json_object *ws_request_new(const char *op) return rq; } -void ws_init(const char *url, const char *user, const char *pwd) +void ws_set_config(const char *url, const char *user, const char *pwd) { char *tmp; @@ -85,28 +95,91 @@ void ws_init(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"); } -struct json_object *ws_execute(struct json_object *rq) +static const char *ws_reply_get_error(struct json_object *content) +{ + 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(session_url, rq); + rp = http_json_get(sess, 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) { + str = ws_reply_get_error(content); + + if (str) { + log_debug("execute() err=%s", str); + content = NULL; + + if (err) + *err = strdup(str); + } else { + json_object_get(content); + } } json_object_put(rp); } - return NULL; + log_debug("execute() done"); + + return content; +} + +struct json_object *ws_execute(struct json_object *rq) +{ + char *err; + struct json_object *result; + + log_debug("ws_execute()"); + pthread_mutex_lock(&lock); + log_debug("ws_execute() lock"); + + err = NULL; + result = execute(session, rq, &err); + + if (err) { + log_debug("ws_execute(): error=%s", err); + + if (!strcmp(err, "NOT_LOGGED_IN")) { + ws_open_session(); + result = execute(session, rq, NULL); + } + + free(err); + } + + log_debug("ws_execute() unlock"); + pthread_mutex_unlock(&lock); + + log_debug("ws_execute()"); + + return result; } int ws_get_api_version() @@ -151,7 +224,7 @@ char *ws_login() str = strdup(json_object_get_string(j)); json_object_put(rp); - } + } return str; } @@ -160,9 +233,12 @@ int ws_open_session() { int version, result; + log_debug("ws_open_session()"); + if (session_id) free(session_id); + session_id = NULL; session_id = ws_login(); if (session_id) { @@ -183,38 +259,62 @@ 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) { struct json_object *rp, *rq, *jheadline, *j; - int i, n, err, hid; + int i, n, hid; struct headline *h, **tmp; const char *title, *url; @@ -243,6 +343,10 @@ int ws_update_headlines(struct feed *feed) h = headline_new(hid, url, title); + j = json_object_object_get(jheadline, + "updated"); + h->date = json_object_get_int(j); + tmp = headlines_add(feed->headlines, h); if (feed->headlines) free(feed->headlines); @@ -252,34 +356,32 @@ int ws_update_headlines(struct feed *feed) j = json_object_object_get(jheadline, "unread"); h->unread = json_object_get_boolean(j); } - err = 0; + + if (!feed->headlines) { + feed->headlines = malloc(sizeof(struct headline *)); + *(feed->headlines) = NULL; + } + + json_object_put(rp); + return 1; } else { - err = 1; + return 0; } - - json_object_put(rp); - return !err; } -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("ttrss_get_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); @@ -302,15 +404,79 @@ 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); } - } else { - feeds_free(feeds); - feeds = NULL; } - json_object_put(rp); + return feeds; +} - log_debug("ttrss_get_feeds() done"); +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); + } + + log_debug("ws_update_feeds() done"); return feeds; } + +struct json_object *ws_request_new_set_article_unread(int id, int unread) +{ + struct json_object *rq; + + 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)); + + return rq; +} + +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_set_article_unread(id, unread); + + rp = ws_execute(rq); + + json_object_put(rq); + + if (rp) + json_object_put(rp); + + log_debug("ws_set_article_unread(%d,%d) done", id, unread); +} + +void ws_init() +{ + pthread_mutexattr_t attr; + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); + pthread_mutex_init(&lock, &attr); + + session = http_session_new(); +}