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()");
+
+ 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);
+ }
+
+ return result;
}
int ws_get_api_version()
str = strdup(json_object_get_string(j));
json_object_put(rp);
- }
+ }
return str;
}
{
int version, result;
+ log_debug("ws_open_session()");
+
if (session_id)
free(session_id);
+ session_id = NULL;
session_id = ws_login();
if (session_id) {
return feeds;
}
-void ws_set_article_unread(int id, int unread)
+struct json_object *ws_request_new_set_article_unread(int id, int unread)
{
- struct json_object *rp, *rq;
-
- log_debug("ws_set_article_unread(%d,%d)", id, 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);