projects
/
prss.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[prss.git]
/
src
/
ttrss_ws.c
diff --git
a/src/ttrss_ws.c
b/src/ttrss_ws.c
index
267b129
..
582f9fb
100644
(file)
--- a/
src/ttrss_ws.c
+++ b/
src/ttrss_ws.c
@@
-17,9
+17,11
@@
* 02110-1301 USA
*/
* 02110-1301 USA
*/
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
-#include <stdio.h>
+
+#include <pthread.h>
#include <json/json.h>
#include <json/json.h>
@@
-33,6
+35,9
@@
static char *session_url;
static char *session_user;
static char *session_pwd;
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));
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));
@@
-43,6
+48,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));
}
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;
struct json_object *ws_request_new(const char *op)
{
struct json_object *rq;
@@
-57,7
+67,7
@@
struct json_object *ws_request_new(const char *op)
return rq;
}
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;
{
char *tmp;
@@
-88,12
+98,13
@@
struct json_object *ws_reply_get_content(struct json_object *rp)
return json_object_object_get(rp, "content");
}
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;
{
struct json_object *rp, *content, *jerror;
const char *str;
- rp = http_json_get(session_url, rq);
+ rp = http_json_get(sess
, sess
ion_url, rq);
content = NULL;
content = NULL;
@@
-125,21
+136,28
@@
struct json_object *ws_execute(struct json_object *rq)
struct json_object *result;
log_debug("ws_execute()");
struct json_object *result;
log_debug("ws_execute()");
+ pthread_mutex_lock(&lock);
+ log_debug("ws_execute() lock");
err = NULL;
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();
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);
}
}
free(err);
}
+ log_debug("ws_execute() unlock");
+ pthread_mutex_unlock(&lock);
+
+ log_debug("ws_execute()");
+
return result;
}
return result;
}
@@
-213,6
+231,7
@@
int ws_open_session()
session_id = NULL;
result = 0;
}
session_id = NULL;
result = 0;
}
+ result = 1;
} else {
result = 0;
}
} else {
result = 0;
}
@@
-257,6
+276,7
@@
int ws_update_headlines(struct feed *feed)
rq = ws_request_new("getHeadlines");
ws_request_add_att_int(rq, "feed_id", feed->id);
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);
rp = ws_execute(rq);
@@
-280,6
+300,14
@@
int ws_update_headlines(struct feed *feed)
h = headline_new(hid, url, title);
h = headline_new(hid, url, title);
+ j = json_object_object_get(jheadline,
+ "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);
tmp = headlines_add(feed->headlines, h);
if (feed->headlines)
free(feed->headlines);
@@
-337,6
+365,8
@@
struct feed **ws_update_feeds(struct feed **feeds)
j = json_object_object_get(jfeed, "unread");
feed->unread = json_object_get_int(j);
j = json_object_object_get(jfeed, "unread");
feed->unread = json_object_get_int(j);
+
+ ws_update_headlines(feed);
}
json_object_put(rp);
} else {
}
json_object_put(rp);
} else {
@@
-378,3
+408,12
@@
void ws_set_article_unread(int id, int unread)
log_debug("ws_set_article_unread(%d,%d) done", id, unread);
}
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);
+
+ session = http_session_new();
+}