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
..
d2c673f
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>
@@
-28,6
+30,8
@@
#include "ttrss_ws.h"
#include "url.h"
#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_id;
static char *session_url;
static char *session_user;
@@
-43,6
+47,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
+66,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;
@@
-125,6
+134,8
@@
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;
result = execute(rq, &err);
err = NULL;
result = execute(rq, &err);
@@
-140,6
+151,11
@@
struct json_object *ws_execute(struct json_object *rq)
free(err);
}
free(err);
}
+ log_debug("ws_execute() unlock");
+ pthread_mutex_unlock(lock);
+
+ log_debug("ws_execute()");
+
return result;
}
return result;
}
@@
-205,7
+221,7
@@
int ws_open_session()
if (session_id) {
version = ws_get_api_version();
log_debug("API version= %d", version);
if (session_id) {
version = ws_get_api_version();
log_debug("API version= %d", version);
-
+
if (version > 0) {
result = 1;
} else {
if (version > 0) {
result = 1;
} else {
@@
-213,6
+229,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
+274,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
+298,10
@@
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));
+
tmp = headlines_add(feed->headlines, h);
if (feed->headlines)
free(feed->headlines);
tmp = headlines_add(feed->headlines, h);
if (feed->headlines)
free(feed->headlines);
@@
-378,3
+400,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);
+ lock = malloc(sizeof(pthread_mutex_t));
+ pthread_mutex_init(lock, &attr);
+}