X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Frssclient%2Fserv_rssclient.c;h=909587d6284f21d50852117f38870c56317196b4;hb=58f686487cf5f14d5da5357c67f2e6624dbde027;hp=10e71dcfb5ce759821ac37ed9a69a73f48d33344;hpb=457dddd9354898c5b9f9937f2ef344504d3fa4b0;p=citadel.git
diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index 10e71dcfb..909587d62 100644
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -1,7 +1,7 @@
/*
* Bring external RSS feeds into rooms.
*
- * Copyright (c) 2007-2012 by the citadel.org team
+ * Copyright (c) 2007-2017 by the citadel.org team
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
@@ -48,651 +48,169 @@
#include "citadel_dirs.h"
#include "md5.h"
#include "context.h"
-#include "event_client.h"
#include "rss_atom_parser.h"
+struct rssroom {
+ struct rssroom *next;
+ char *room;
+};
-#define TMP_MSGDATA 0xFF
-#define TMP_SHORTER_URL_OFFSET 0xFE
-#define TMP_SHORTER_URLS 0xFD
-
-time_t last_run = 0L;
+struct rssurl {
+ struct rssurl *next;
+ char *url;
+ struct rssroom *rooms;
+};
-pthread_mutex_t RSSQueueMutex; /* locks the access to the following vars: */
-HashList *RSSQueueRooms = NULL; /* rss_room_counter */
-HashList *RSSFetchUrls = NULL; /*->rss_aggregator;->RefCount access locked*/
-eNextState RSSAggregator_Terminate(AsyncIO *IO);
-eNextState RSSAggregator_TerminateDB(AsyncIO *IO);
-eNextState RSSAggregator_ShutdownAbort(AsyncIO *IO);
+time_t last_run = 0L;
struct CitContext rss_CC;
+struct rssurl *rsstodo = NULL;
-struct rssnetcfg *rnclist = NULL;
-int RSSClientDebugEnabled = 0;
-#define N ((rss_aggregator*)IO->Data)->QRnumber
-
-#define DBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (RSSClientDebugEnabled != 0))
-
-#define EVRSSC_syslog(LEVEL, FORMAT, ...) \
- DBGLOG(LEVEL) syslog(LEVEL, \
- "IO[%ld]CC[%d][%ld]RSS" FORMAT, \
- IO->ID, CCID, N, __VA_ARGS__)
-
-#define EVRSSCM_syslog(LEVEL, FORMAT) \
- DBGLOG(LEVEL) syslog(LEVEL, \
- "IO[%ld]CC[%d][%ld]RSS" FORMAT, \
- IO->ID, CCID, N)
-
-#define EVRSSQ_syslog(LEVEL, FORMAT, ...) \
- DBGLOG(LEVEL) syslog(LEVEL, "RSS" FORMAT, \
- __VA_ARGS__)
-#define EVRSSQM_syslog(LEVEL, FORMAT) \
- DBGLOG(LEVEL) syslog(LEVEL, "RSS" FORMAT)
-
-#define EVRSSCSM_syslog(LEVEL, FORMAT) \
- DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld][%ld]RSS" FORMAT, \
- IO->ID, N)
-
-typedef enum _RSSState {
- eRSSCreated,
- eRSSFetching,
- eRSSFailure,
- eRSSParsing,
- eRSSUT
-} RSSState;
-ConstStr RSSStates[] = {
- {HKEY("Aggregator created")},
- {HKEY("Fetching content")},
- {HKEY("Failed")},
- {HKEY("parsing content")},
- {HKEY("checking usetable")}
-};
-
-static void SetRSSState(AsyncIO *IO, RSSState State)
-{
- CitContext* CCC = IO->CitContext;
- memcpy(CCC->cs_clientname, RSSStates[State].Key, RSSStates[State].len + 1);
-}
-void DeleteRoomReference(long QRnumber)
+// Add a feed/room pair into the todo list
+//
+void rssclient_push_todo(char *rssurl, char *roomname)
{
- HashPos *At;
- long HKLen;
- const char *HK;
- void *vData = NULL;
- rss_room_counter *pRoomC;
+ struct rssurl *r = NULL;
+ struct rssurl *thisone = NULL;
+ struct rssroom *newroom = NULL;
- At = GetNewHashPos(RSSQueueRooms, 0);
+ syslog(LOG_DEBUG, "rssclient_push_todo(%s, %s)", rssurl, roomname);
- if (GetHashPosFromKey(RSSQueueRooms, LKEY(QRnumber), At))
- {
- GetHashPos(RSSQueueRooms, At, &HKLen, &HK, &vData);
- if (vData != NULL)
- {
- pRoomC = (rss_room_counter *) vData;
- pRoomC->count --;
- if (pRoomC->count == 0)
- DeleteEntryFromHash(RSSQueueRooms, At);
+ for (r=rsstodo; r!=NULL; r=r->next) {
+ if (!strcasecmp(r->url, rssurl)) {
+ thisone = r;
}
}
- DeleteHashPos(&At);
-}
-
-void UnlinkRooms(rss_aggregator *RSSAggr)
-{
- DeleteRoomReference(RSSAggr->QRnumber);
- if (RSSAggr->OtherQRnumbers != NULL)
- {
- long HKLen;
- const char *HK;
- HashPos *At;
- void *vData;
-
- At = GetNewHashPos(RSSAggr->OtherQRnumbers, 0);
- while (! server_shutting_down &&
- GetNextHashPos(RSSAggr->OtherQRnumbers,
- At,
- &HKLen, &HK,
- &vData) &&
- (vData != NULL))
- {
- long *lData = (long*) vData;
- DeleteRoomReference(*lData);
- }
-
- DeleteHashPos(&At);
+ if (thisone == NULL) {
+ thisone = malloc(sizeof(struct rssurl));
+ thisone->url = strdup(rssurl);
+ thisone->rooms = NULL;
+ thisone->next = rsstodo;
+ rsstodo = thisone;
}
-}
-void UnlinkRSSAggregator(rss_aggregator *RSSAggr)
-{
- HashPos *At;
-
- pthread_mutex_lock(&RSSQueueMutex);
- UnlinkRooms(RSSAggr);
-
- At = GetNewHashPos(RSSFetchUrls, 0);
- if (GetHashPosFromKey(RSSFetchUrls, SKEY(RSSAggr->Url), At))
- {
- DeleteEntryFromHash(RSSFetchUrls, At);
- }
- DeleteHashPos(&At);
- last_run = time(NULL);
- pthread_mutex_unlock(&RSSQueueMutex);
+ newroom = malloc(sizeof(struct rssroom));
+ newroom->room = strdup(roomname);
+ newroom->next = thisone->rooms;
+ thisone->rooms = newroom;
}
-void DeleteRssCfg(void *vptr)
-{
- rss_aggregator *RSSAggr = (rss_aggregator *)vptr;
- AsyncIO *IO = &RSSAggr->IO;
-
- if (IO->CitContext != NULL)
- EVRSSCM_syslog(LOG_DEBUG, "RSS: destroying\n");
-
- FreeStrBuf(&RSSAggr->Url);
- FreeStrBuf(&RSSAggr->rooms);
- FreeStrBuf(&RSSAggr->CData);
- FreeStrBuf(&RSSAggr->Key);
- DeleteHash(&RSSAggr->OtherQRnumbers);
-
- DeleteHashPos (&RSSAggr->Pos);
- DeleteHash (&RSSAggr->Messages);
- if (RSSAggr->recp.recp_room != NULL)
- free(RSSAggr->recp.recp_room);
-
-
- if (RSSAggr->Item != NULL)
- {
- flush_rss_item(RSSAggr->Item);
-
- free(RSSAggr->Item);
- }
-
- FreeAsyncIOContents(&RSSAggr->IO);
- memset(RSSAggr, 0, sizeof(rss_aggregator));
- free(RSSAggr);
-}
-eNextState RSSAggregator_Terminate(AsyncIO *IO)
+// Callback function for curl
+//
+size_t rss_pof_write_data(void *buffer, size_t size, size_t nmemb, void *userp)
{
- rss_aggregator *RSSAggr = (rss_aggregator *)IO->Data;
-
- EVRSSCM_syslog(LOG_DEBUG, "RSS: Terminating.\n");
-
- StopCurlWatchers(IO);
- UnlinkRSSAggregator(RSSAggr);
- return eAbort;
+ StrBuf *Downloaded = (StrBuf *)userp;
+ size_t bytes = size * nmemb;
+ StrBufAppendBufPlain(Downloaded, buffer, bytes, 0);
+ return(bytes);
}
-eNextState RSSAggregator_TerminateDB(AsyncIO *IO)
-{
- rss_aggregator *RSSAggr = (rss_aggregator *)IO->Data;
-
- EVRSSCM_syslog(LOG_DEBUG, "RSS: Terminating.\n");
-
- StopDBWatchers(&RSSAggr->IO);
- UnlinkRSSAggregator(RSSAggr);
- return eAbort;
-}
-
-eNextState RSSAggregator_ShutdownAbort(AsyncIO *IO)
+// pull one feed (possibly multiple rooms)
+//
+void rss_pull_one_feed(struct rssurl *url)
{
- const char *pUrl;
- rss_aggregator *RSSAggr = (rss_aggregator *)IO->Data;
-
- pUrl = IO->ConnectMe->PlainUrl;
- if (pUrl == NULL)
- pUrl = "";
+ struct rssroom *r;
+ CURL *curl;
+ CURLcode res;
+ StrBuf *Downloaded = NULL;
- EVRSSC_syslog(LOG_DEBUG, "RSS: Aborting by shutdown: %s.\n", pUrl);
+ syslog(LOG_DEBUG, "rss_pull_one_feed(%s)", url->url);
- StopCurlWatchers(IO);
- UnlinkRSSAggregator(RSSAggr);
- return eAbort;
-}
-
-void AppendLink(StrBuf *Message,
- StrBuf *link,
- StrBuf *LinkTitle,
- const char *Title)
-{
- if (StrLength(link) > 0)
- {
- StrBufAppendBufPlain(Message, HKEY(""), 0);
- if (StrLength(LinkTitle) > 0)
- StrBufAppendBuf(Message, LinkTitle, 0);
- else if ((Title != NULL) && !IsEmptyStr(Title))
- StrBufAppendBufPlain(Message, Title, -1, 0);
- else
- StrBufAppendBuf(Message, link, 0);
- StrBufAppendBufPlain(Message, HKEY("
\n"), 0);
+ curl = curl_easy_init();
+ if (!curl) {
+ return;
}
-}
+ Downloaded = NewStrBuf();
-void rss_format_item(networker_save_message *SaveMsg)
-{
- StrBuf *Message;
- int msglen = 0;
-
- if (SaveMsg->author_or_creator != NULL) {
-
- char *From;
- StrBuf *Encoded = NULL;
- int FromAt;
-
- From = html_to_ascii(ChrPtr(SaveMsg->author_or_creator),
- StrLength(SaveMsg->author_or_creator),
- 512, 0);
- StrBufPlain(SaveMsg->author_or_creator, From, -1);
- StrBufTrim(SaveMsg->author_or_creator);
- free(From);
-
- FromAt = strchr(ChrPtr(SaveMsg->author_or_creator), '@') != NULL;
- if (!FromAt && StrLength (SaveMsg->author_email) > 0)
- {
- StrBufRFC2047encode(&Encoded, SaveMsg->author_or_creator);
- SaveMsg->Msg.cm_fields['A'] = SmashStrBuf(&Encoded);
- SaveMsg->Msg.cm_fields['P'] =
- SmashStrBuf(&SaveMsg->author_email);
- }
- else
- {
- if (FromAt)
- {
- SaveMsg->Msg.cm_fields['A'] =
- SmashStrBuf(&SaveMsg->author_or_creator);
- SaveMsg->Msg.cm_fields['P'] =
- strdup(SaveMsg->Msg.cm_fields['A']);
- }
- else
- {
- StrBufRFC2047encode(&Encoded,
- SaveMsg->author_or_creator);
- SaveMsg->Msg.cm_fields['A'] =
- SmashStrBuf(&Encoded);
- SaveMsg->Msg.cm_fields['P'] =
- strdup("rss@localhost");
-
- }
- }
+ curl_easy_setopt(curl, CURLOPT_URL, url->url);
+ curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); // Follow redirects
+ curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, rss_pof_write_data); // What to do with downloaded data
+ curl_easy_setopt(curl, CURLOPT_WRITEDATA, Downloaded); // Give it our StrBuf to work with
+ curl_easy_setopt(curl, CURLOPT_TIMEOUT, 20L); // Time out after 20 seconds
+ res = curl_easy_perform(curl); // Perform the request
+ if (res != CURLE_OK) {
+ syslog(LOG_WARNING, "Failed to load feed: %s", curl_easy_strerror(res));
}
- else {
- SaveMsg->Msg.cm_fields['A'] = strdup("rss");
- }
-
- SaveMsg->Msg.cm_fields['N'] = strdup(NODENAME);
- if (SaveMsg->title != NULL) {
- long len;
- char *Sbj;
- StrBuf *Encoded, *QPEncoded;
-
- QPEncoded = NULL;
- StrBufSpaceToBlank(SaveMsg->title);
- len = StrLength(SaveMsg->title);
- Sbj = html_to_ascii(ChrPtr(SaveMsg->title), len, 512, 0);
- len = strlen(Sbj);
- if ((len > 0) && (Sbj[len - 1] == '\n'))
- {
- len --;
- Sbj[len] = '\0';
- }
- Encoded = NewStrBufPlain(Sbj, len);
- free(Sbj);
+ curl_easy_cleanup(curl);
- StrBufTrim(Encoded);
- StrBufRFC2047encode(&QPEncoded, Encoded);
+ // FIXME parse the feed, dummeh ... it's in ChrPtr(Downloaded)
- SaveMsg->Msg.cm_fields['U'] = SmashStrBuf(&QPEncoded);
- FreeStrBuf(&Encoded);
+ for (r=url->rooms; r!=NULL; r=r->next) {
+ syslog(LOG_DEBUG, "Saving item to %s", r->room);
+ // FIXME save to rooms
}
- if (SaveMsg->link == NULL)
- SaveMsg->link = NewStrBufPlain(HKEY(""));
-
-#if 0 /* temporarily disable shorter urls. */
- SaveMsg->Msg.cm_fields[TMP_SHORTER_URLS] =
- GetShorterUrls(SaveMsg->description);
-#endif
-
- msglen += 1024 + StrLength(SaveMsg->link) + StrLength(SaveMsg->description) ;
-
- Message = NewStrBufPlain(NULL, msglen);
-
- StrBufPlain(Message, HKEY(
- "Content-type: text/html; charset=\"UTF-8\"\r\n\r\n"
- "