static char *session_pwd;
static pthread_mutex_t lock;
-static struct http_session *http_session;
+static struct http_session *session;
void ws_request_add_att_str(json_object *rq, const char *k, const char *str)
{
struct json_object *ws_reply_get_content(struct json_object *rp)
{
+ log_debug("ws_reply_get_content");
return json_object_object_get(rp, "content");
}
-static struct json_object *execute(struct json_object *rq, char **err)
+static const char *ws_reply_get_error(struct json_object *content)
{
- struct json_object *rp, *content, *jerror;
+ struct json_object *jerror;
+
+ 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(http_session, session_url, rq);
+ rp = http_json_get(sess, session_url, rq);
content = NULL;
content = ws_reply_get_content(rp);
if (content) {
- jerror = json_object_object_get(content, "error");
- if (jerror) {
- if (err) {
- str = json_object_get_string(jerror);
- *err = strdup(str);
- }
+ str = ws_reply_get_error(content);
+
+ if (str) {
+ *err = strdup(str);
content = NULL;
} else {
- json_object_get(content);
+ json_object_get(content);
}
}
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);
+ log_debug("ws_execute(): error=%s", err);
if (!strcmp(err, "NOT_LOGGED_IN")) {
ws_open_session();
- result = execute(rq, NULL);
+ result = execute(session, rq, NULL);
}
free(err);
rq = ws_request_new("getFeeds");
rp = ws_execute(rq);
+
json_object_put(rq);
if (rp) {
j = json_object_object_get(jfeed, "id");
id = json_object_get_int(j);
-
+
feed = feeds_get_feed(feeds, id);
if (!feed) {
j = json_object_object_get(jfeed, "unread");
feed->unread = json_object_get_int(j);
+
+ ws_update_headlines(feed);
}
json_object_put(rp);
} else {
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
pthread_mutex_init(&lock, &attr);
- http_session = http_session_new();
+ session = http_session_new();
}