X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fttrss_ws.c;h=654374f49259070d167f70b26f43cb08dca456f2;hp=3b979c8ee899f5f78a0b837a557205cc1e374933;hb=bc5b505b6dfc1103b226e5449c90ff5e9048d4ef;hpb=ba047027e5c6b1f6e2ec6ae5846a37f5c44dc412 diff --git a/src/ttrss_ws.c b/src/ttrss_ws.c index 3b979c8..654374f 100644 --- a/src/ttrss_ws.c +++ b/src/ttrss_ws.c @@ -17,15 +17,21 @@ * 02110-1301 USA */ -#include #include +#include +#include + +#include #include #include "http.h" +#include "log.h" #include "ttrss_ws.h" #include "url.h" +static pthread_mutex_t lock; + static char *session_id; static char *session_url; static char *session_user; @@ -41,6 +47,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; @@ -55,7 +66,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; @@ -86,25 +97,66 @@ 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) +static struct json_object *execute(struct json_object *rq, char **err) { - struct json_object *rp, *content; + struct json_object *rp, *content, *jerror; + const char *str; rp = http_json_get(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) { + jerror = json_object_object_get(content, "error"); + if (jerror) { + if (err) { + str = json_object_get_string(jerror); + *err = strdup(str); + } + content = NULL; + } else { + json_object_get(content); + } } json_object_put(rp); } - return NULL; + 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(rq, &err); + + if (err) { + log_debug("ws_execute(): error=%s\n", err); + + if (!strcmp(err, "NOT_LOGGED_IN")) { + ws_open_session(); + result = execute(rq, NULL); + } + + free(err); + } + + log_debug("ws_execute() unlock"); + pthread_mutex_unlock(&lock); + + log_debug("ws_execute()"); + + return result; } int ws_get_api_version() @@ -141,13 +193,14 @@ char *ws_login() rp = ws_execute(rq); json_object_put(rq); + str = NULL; if (rp) { j = json_object_object_get(rp, "session_id"); - str = strdup(json_object_get_string(j)); + + if (j) + str = strdup(json_object_get_string(j)); json_object_put(rp); - } else { - str = NULL; } return str; @@ -157,14 +210,17 @@ 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) { version = ws_get_api_version(); - printf("API version: %d\n", version); + log_debug("API version= %d", version); if (version > 0) { result = 1; @@ -173,6 +229,7 @@ int ws_open_session() session_id = NULL; result = 0; } + result = 1; } else { result = 0; } @@ -211,12 +268,13 @@ char *ws_get_article_content(int id) 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; 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); @@ -240,6 +298,10 @@ 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)); + tmp = headlines_add(feed->headlines, h); if (feed->headlines) free(feed->headlines); @@ -249,13 +311,11 @@ int ws_update_headlines(struct feed *feed) j = json_object_object_get(jheadline, "unread"); h->unread = json_object_get_boolean(j); } - err = 0; + 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) @@ -265,7 +325,7 @@ struct feed **ws_update_feeds(struct feed **feeds) struct feed *feed, **tmp; const char *title, *url; - printf("ttrss_get_feeds\n"); + log_debug("ws_update_feeds()"); rq = ws_request_new("getFeeds"); @@ -295,21 +355,55 @@ struct feed **ws_update_feeds(struct feed **feeds) tmp = feeds_add(feeds, feed); free(feeds); feeds = tmp; - } else { - printf("found!\n"); } j = json_object_object_get(jfeed, "unread"); feed->unread = json_object_get_int(j); } + json_object_put(rp); } else { feeds_free(feeds); feeds = NULL; } - json_object_put(rp); - - printf("ttrss_get_feeds ended\n"); + 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); +}