#include "ttrss_ws.h"
#include "url.h"
-static pthread_mutex_t *lock;
-
static char *session_id;
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));
return json_object_object_get(rp, "content");
}
-static struct json_object *execute(struct json_object *rq, char **err)
+static struct json_object *
+execute(struct http_session *sess, struct json_object *rq, char **err)
{
struct json_object *rp, *content, *jerror;
const char *str;
- rp = http_json_get(session_url, rq);
+ rp = http_json_get(sess, session_url, rq);
content = NULL;
struct json_object *result;
log_debug("ws_execute()");
- pthread_mutex_lock(lock);
+ pthread_mutex_lock(&lock);
log_debug("ws_execute() lock");
err = NULL;
- result = execute(rq, &err);
+ result = execute(session, 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);
+ result = execute(session, rq, NULL);
}
free(err);
}
log_debug("ws_execute() unlock");
- pthread_mutex_unlock(lock);
+ pthread_mutex_unlock(&lock);
log_debug("ws_execute()");
int ws_open_session()
{
- int /*version, */result;
+ int version, result;
log_debug("ws_open_session()");
session_id = ws_login();
if (session_id) {
- /*version = ws_get_api_version();
+ version = ws_get_api_version();
log_debug("API version= %d", version);
if (version > 0) {
free(session_id);
session_id = NULL;
result = 0;
- }*/
+ }
result = 1;
} else {
result = 0;
"excerpt");
h->excerpt = strdup(json_object_get_string(j));
+ 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);
j = json_object_object_get(jfeed, "unread");
feed->unread = json_object_get_int(j);
+
+ ws_update_headlines(feed);
}
json_object_put(rp);
} else {
void ws_init()
{
- pthread_mutexattr_t attr;
-
+ pthread_mutexattr_t attr;
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
- lock = malloc(sizeof(pthread_mutex_t));
- pthread_mutex_init(lock, &attr);
+ pthread_mutex_init(&lock, &attr);
+
+ session = http_session_new();
}