starbitdev/zblock
1
0
Fork 0
mirror of https://github.com/WCBROW01/zblock.git synced 2025-12-12 04:28:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

[main.c] Attempt to fix feed retrieval

Browse Source
This commit is contained in:
Mina Brown
2024-11-24 11:47:01 -05:00
parent 56ae903c41
commit e1bbea325c
1 changed files with 73 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
main.c
View File

@ -43,9 +43,6 @@ struct bot_command {
discord_create_interaction_response(client, event->id, event->token, &res, NULL); \ discord_create_interaction_response(client, event->id, event->token, &res, NULL); \
} while (0) } while (0)
// default interval for the feed retrieval timer
#define TIMER_INTERVAL 600
typedef struct { typedef struct {
zblock_feed_info_minimal info; zblock_feed_info_minimal info;
FILE *fp; FILE *fp;
@ -69,23 +66,7 @@ static void timer_retrieve_feeds(struct discord *client, struct discord_timer *t
); );
if (PQresultStatus(database_res) != PGRES_TUPLES_OK) { if (PQresultStatus(database_res) != PGRES_TUPLES_OK) {
log_error("Unable to retrieve feed list: %s", PQresultErrorMessage(database_res)); log_error("Unable to retrieve feed list: %s", PQresultErrorMessage(database_res));
PQclear(database_res); goto all_done;
return;
}
// get all the required feed info to send messages
int nfeeds = PQntuples(database_res);
zblock_feed_buffer *feed_list = malloc(nfeeds * sizeof(*feed_list));
if (!feed_list) {
log_error("Unable to retrieve feed list: %s", strerror(errno));
PQclear(database_res);
return;
}
for (int i = 0; i < nfeeds; ++i) {
feed_list[i].info.url = PQgetvalue(database_res, i, 0);
feed_list[i].info.last_pubDate = PQgetvalue(database_res, i, 1);
feed_list[i].info.channel_id = be64toh(*(uint64_t *) PQgetvalue(database_res, i, 2));
} }
// get all those feeds // get all those feeds
@ -96,38 +77,46 @@ static void timer_retrieve_feeds(struct discord *client, struct discord_timer *t
goto all_done; goto all_done;
} }
// put running handles up here so we can start transfers now instead of later
int running_handles;
// get all the required feed info to send messages
int nfeeds = PQntuples(database_res);
for (int i = 0; i < nfeeds; ++i) { for (int i = 0; i < nfeeds; ++i) {
feed_list[i].fp = open_memstream(&feed_list[i].buf, &feed_list[i].bufsize); zblock_feed_buffer *feed_buffer = malloc(sizeof(*feed_buffer));
if (!feed_list[i].fp) continue; // fail gracefully if (!feed_buffer) {
log_error("Failure allocating feed buffer: %s", strerror(errno));
continue;
}
feed_buffer->info.url = PQgetvalue(database_res, i, 0);
feed_buffer->info.last_pubDate = PQgetvalue(database_res, i, 1);
feed_buffer->info.channel_id = be64toh(*(uint64_t *) PQgetvalue(database_res, i, 2));
feed_buffer->fp = open_memstream(&feed_buffer->buf, &feed_buffer->bufsize);
if (!feed_buffer->fp) continue; // fail gracefully
CURL *feed_handle = curl_easy_init(); CURL *feed_handle = curl_easy_init();
if (!feed_handle) { if (!feed_handle) {
fclose(feed_list[i].fp); fclose(feed_buffer->fp);
free(feed_list[i].buf); free(feed_buffer->buf);
continue; continue;
} }
curl_easy_setopt(feed_handle, CURLOPT_URL, feed_list[i].info.url); curl_easy_setopt(feed_handle, CURLOPT_URL, feed_buffer->info.url);
curl_easy_setopt(feed_handle, CURLOPT_WRITEDATA, feed_list[i].fp); curl_easy_setopt(feed_handle, CURLOPT_WRITEDATA, feed_buffer->fp);
curl_easy_setopt(feed_handle, CURLOPT_PRIVATE, &feed_list[i]); curl_easy_setopt(feed_handle, CURLOPT_PRIVATE, feed_buffer);
CURLMcode mc = curl_multi_add_handle(multi, feed_handle); CURLMcode mc = curl_multi_add_handle(multi, feed_handle);
if (mc) { if (mc) {
log_error("Unable to retrieve feed list: %s", curl_multi_strerror(mc)); log_error("Unable to retrieve feed list: %s", curl_multi_strerror(mc));
curl_easy_cleanup(feed_handle); curl_easy_cleanup(feed_handle);
fclose(feed_list[i].fp); fclose(feed_buffer->fp);
free(feed_list[i].buf); free(feed_buffer->buf);
continue; continue;
} }
curl_multi_perform(multi, &running_handles);
} }
// it's time // it's time
int running_handles_prev = 0;
int running_handles;
do { do {
CURLMcode mc = curl_multi_perform(multi, &running_handles); CURLMcode mc = curl_multi_perform(multi, &running_handles);
if (running_handles < running_handles_prev) {
running_handles_prev = running_handles;
CURLMsg *msg; CURLMsg *msg;
int msgs_in_queue; int msgs_in_queue;
do { do {
@ -143,9 +132,9 @@ static void timer_retrieve_feeds(struct discord *client, struct discord_timer *t
mrss_t *mrss_feed; mrss_t *mrss_feed;
mrss_error_t mrss_err = mrss_parse_buffer(feed_buffer->buf, feed_buffer->bufsize, &mrss_feed); mrss_error_t mrss_err = mrss_parse_buffer(feed_buffer->buf, feed_buffer->bufsize, &mrss_feed);
if (!mrss_err) { if (!mrss_err) {
// get publication date of entries send any new ones // get publication date of entries and send any new ones
time_t last_pubDate_time = pubDate_to_time_t(feed_buffer->info.last_pubDate);
mrss_item_t *item = mrss_feed->item; mrss_item_t *item = mrss_feed->item;
time_t last_pubDate_time = pubDate_to_time_t(feed_buffer->info.last_pubDate);
bool update_pubDate = false; bool update_pubDate = false;
while (item && pubDate_to_time_t(item->pubDate) > last_pubDate_time) { while (item && pubDate_to_time_t(item->pubDate) > last_pubDate_time) {
update_pubDate = true; update_pubDate = true;
@ -176,9 +165,9 @@ static void timer_retrieve_feeds(struct discord *client, struct discord_timer *t
curl_multi_remove_handle(multi, handle); curl_multi_remove_handle(multi, handle);
curl_easy_cleanup(handle); curl_easy_cleanup(handle);
free(feed_buffer->buf); free(feed_buffer->buf);
free(feed_buffer);
} }
} while (msg); } while (msg);
}
if (!mc && running_handles) { if (!mc && running_handles) {
mc = curl_multi_poll(multi, NULL, 0, 300, NULL); mc = curl_multi_poll(multi, NULL, 0, 300, NULL);
@ -188,15 +177,12 @@ static void timer_retrieve_feeds(struct discord *client, struct discord_timer *t
log_fatal("curl_multi_poll(): %s", curl_multi_strerror(mc)); log_fatal("curl_multi_poll(): %s", curl_multi_strerror(mc));
exit(1); exit(1);
} }
running_handles_prev = running_handles;
} while (running_handles); } while (running_handles);
curl_multi_cleanup(multi); curl_multi_cleanup(multi);
// processing is done // processing is done
all_done: all_done:
free(feed_list);
PQclear(database_res); PQclear(database_res);
} }
@ -373,6 +359,9 @@ static void on_interaction(struct discord *client, const struct discord_interact
discord_create_interaction_response(client, event->id, event->token, &res, NULL); discord_create_interaction_response(client, event->id, event->token, &res, NULL);
} }
// default interval for the feed retrieval timer (in ms)
#define TIMER_INTERVAL 600000
int main(void) { int main(void) {
int exit_code = 0; int exit_code = 0;