#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 *http_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));
struct json_object *rp, *content, *jerror;
const char *str;
- rp = http_json_get(session_url, rq);
+ rp = http_json_get(http_session, 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;
}
log_debug("ws_execute() unlock");
- pthread_mutex_unlock(lock);
+ pthread_mutex_unlock(&lock);
log_debug("ws_execute()");
if (session_id) {
version = ws_get_api_version();
log_debug("API version= %d", version);
-
+
if (version > 0) {
result = 1;
} else {
"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);
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);
+
+ http_session = http_session_new();
}