Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-25 15:35:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

FeedReader: The feed can be used as source for board

Browse source
This commit is contained in:
thunder2 2023-04-11 00:36:41 +02:00
parent ecffb3cb7f
commit 571f709b50
13 changed files with 704 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

263
plugins/FeedReader/services/p3FeedReader.cc
View file

@ -24,6 +24,7 @@
#include "rsitems/rsconfigitems.h"
#include "retroshare/rsiface.h"
#include "retroshare/rsgxsforums.h"
#include "retroshare/rsposted.h"
#include "util/rsstring.h"
#include "util/rstime.h"
#include "gxs/rsgenexchange.h"
@ -34,6 +35,7 @@ RsFeedReader *rsFeedReader = NULL;
#define FEEDREADER_CLEAN_INTERVAL 1 * 60 * 60 // check every hour
#define FEEDREADER_FORUM_PREFIX "RSS: "
#define FEEDREADER_POSTED_PREFIX "RSS: "
#define MAX_REQUEST_AGE 30 // 30 seconds
@ -41,7 +43,7 @@ RsFeedReader *rsFeedReader = NULL;
* #define FEEDREADER_DEBUG
*********/
p3FeedReader::p3FeedReader(RsPluginHandler* pgHandler, RsGxsForums *forums)
p3FeedReader::p3FeedReader(RsPluginHandler* pgHandler, RsGxsForums *forums, RsPosted *posted)
: RsPQIService(RS_SERVICE_TYPE_PLUGIN_FEEDREADER, 5, pgHandler),
mFeedReaderMtx("p3FeedReader"), mDownloadMutex("p3FeedReaderDownload"), mProcessMutex("p3FeedReaderProcess"), mPreviewMutex("p3FeedReaderPreview")
{
@ -55,6 +57,7 @@ p3FeedReader::p3FeedReader(RsPluginHandler* pgHandler, RsGxsForums *forums)
mStandardProxyPort = 0;
mLastClean = 0;
mForums = forums;
mPosted = posted;
mNotify = NULL;
mSaveInBackground = false;
mStopped = false;
@ -92,6 +95,7 @@ static void feedToInfo(const RsFeedReaderFeed *feed, FeedInfo &info)
info.updateInterval = feed->updateInterval;
info.lastUpdate = feed->lastUpdate;
info.forumId = feed->forumId;
info.postedId = feed->postedId;
info.storageTime = feed->storageTime;
info.errorState = feed->errorState;
info.errorString = feed->errorString;
@ -110,6 +114,10 @@ static void feedToInfo(const RsFeedReaderFeed *feed, FeedInfo &info)
info.flag.deactivated = (feed->flag & RS_FEED_FLAG_DEACTIVATED);
info.flag.forum = (feed->flag & RS_FEED_FLAG_FORUM);
info.flag.updateForumInfo = (feed->flag & RS_FEED_FLAG_UPDATE_FORUM_INFO);
info.flag.posted = (feed->flag & RS_FEED_FLAG_POSTED);
info.flag.updatePostedInfo = (feed->flag & RS_FEED_FLAG_UPDATE_POSTED_INFO);
info.flag.postedFirstImage = (feed->flag & RS_FEED_FLAG_POSTED_FIRST_IMAGE);
info.flag.postedOnlyImage = (feed->flag & RS_FEED_FLAG_POSTED_ONLY_IMAGE);
info.flag.embedImages = (feed->flag & RS_FEED_FLAG_EMBED_IMAGES);
info.flag.saveCompletePage = (feed->flag & RS_FEED_FLAG_SAVE_COMPLETE_PAGE);
@ -151,6 +159,7 @@ static void infoToFeed(const FeedInfo &info, RsFeedReaderFeed *feed)
feed->storageTime = info.storageTime;
feed->forumId = info.forumId;
feed->postedId = info.postedId;
feed->transformationType = info.transformationType;
feed->xpathsToUse.ids = info.xpathsToUse;
@ -193,6 +202,21 @@ static void infoToFeed(const FeedInfo &info, RsFeedReaderFeed *feed)
if (info.flag.updateForumInfo) {
feed->flag |= RS_FEED_FLAG_UPDATE_FORUM_INFO;
}
if (info.flag.posted) {
feed->flag |= RS_FEED_FLAG_POSTED;
}
if (info.flag.updatePostedInfo) {
feed->flag |= RS_FEED_FLAG_UPDATE_POSTED_INFO;
}
if (info.flag.updatePostedInfo) {
feed->flag |= RS_FEED_FLAG_UPDATE_POSTED_INFO;
}
if (info.flag.postedFirstImage) {
feed->flag |= RS_FEED_FLAG_POSTED_FIRST_IMAGE;
}
if (info.flag.postedOnlyImage) {
feed->flag |= RS_FEED_FLAG_POSTED_ONLY_IMAGE;
}
}
static void feedMsgToInfo(const RsFeedReaderMsg *msg, FeedMsgInfo &info)
@ -478,6 +502,9 @@ RsFeedAddResult p3FeedReader::setFeed(uint32_t feedId, const FeedInfo &feedInfo)
std::string forumId;
std::string forumName;
std::string forumDescription;
std::string postedId;
std::string postedName;
std::string postedDescription;
{
RsStackMutex stack(mFeedReaderMtx); /******* LOCK STACK MUTEX *********/
@ -521,6 +548,7 @@ RsFeedAddResult p3FeedReader::setFeed(uint32_t feedId, const FeedInfo &feedInfo)
RsFeedReaderFeed *fi = feedIt->second;
std::string oldForumId = fi->forumId;
std::string oldPostedId = fi->postedId;
std::string oldName = fi->name;
std::string oldDescription = fi->description;
@ -534,6 +562,15 @@ RsFeedAddResult p3FeedReader::setFeed(uint32_t feedId, const FeedInfo &feedInfo)
forumDescription = fi->description;
forumName.insert(0, FEEDREADER_FORUM_PREFIX);
}
if ((fi->flag & RS_FEED_FLAG_POSTED) && (fi->flag & RS_FEED_FLAG_UPDATE_POSTED_INFO) && !fi->postedId.empty() &&
(fi->postedId != oldPostedId || fi->name != oldName || fi->description != oldDescription)) {
/* name or description changed, update posted */
postedId = fi->postedId;
postedName = fi->name;
postedDescription = fi->description;
postedName.insert(0, FEEDREADER_POSTED_PREFIX);
}
}
IndicateConfigChanged();
@ -550,6 +587,14 @@ RsFeedAddResult p3FeedReader::setFeed(uint32_t feedId, const FeedInfo &feedInfo)
//TODO: error
}
if (!postedId.empty()) {
RsPostedGroup postedGroup;
if (getPostedGroup(RsGxsGroupId(postedId), postedGroup)) {
updatePostedGroup(postedGroup, postedName, postedDescription);
}
//TODO: error
}
return RS_FEED_ADD_RESULT_SUCCESS;
}
@ -682,6 +727,7 @@ bool p3FeedReader::addPreviewFeed(const FeedInfo &feedInfo, uint32_t &feedId)
fi->updateInterval = 0;
fi->lastUpdate = 0;
fi->forumId.clear();
fi->postedId.clear();
fi->storageTime = 0;
mFeeds[fi->feedId] = fi;
@ -1885,8 +1931,12 @@ void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedRea
std::list<std::string> addedMsgs;
std::string forumId;
RsGxsId authorId;
RsGxsId forumAuthorId;
std::list<RsFeedReaderMsg> forumMsgs;
std::string postedId;
RsGxsId postedAuthorId;
std::list<RsFeedReaderMsg> postedMsgs;
uint32_t feedFlag = 0;
{
RsStackMutex stack(mFeedReaderMtx); /******* LOCK STACK MUTEX *********/
@ -1903,7 +1953,9 @@ void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedRea
RsFeedReaderFeed *fi = it->second;
bool forum = (fi->flag & RS_FEED_FLAG_FORUM) && !fi->preview;
bool posted = (fi->flag & RS_FEED_FLAG_POSTED) && !fi->preview;
RsFeedReaderErrorState errorState = RS_FEED_ERRORSTATE_OK;
feedFlag = fi->flag;
if (forum && !msgs.empty()) {
if (mForums) {
@ -1913,9 +1965,9 @@ void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedRea
if (getForumGroup(RsGxsGroupId(fi->forumId), forumGroup)) {
if (IS_GROUP_PUBLISHER(forumGroup.mMeta.mSubscribeFlags) && IS_GROUP_ADMIN(forumGroup.mMeta.mSubscribeFlags)) {
forumId = fi->forumId;
authorId = forumGroup.mMeta.mAuthorId;
forumAuthorId = forumGroup.mMeta.mAuthorId;
if (authorId.isNull()) {
if (forumAuthorId.isNull()) {
errorState = RS_FEED_ERRORSTATE_PROCESS_FORUM_NO_AUTHOR;
}
} else {
@ -1933,6 +1985,34 @@ void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedRea
}
}
if (posted && !msgs.empty()) {
if (mPosted) {
if (!fi->postedId.empty()) {
/* check posted */
RsPostedGroup postedGroup;
if (getPostedGroup(RsGxsGroupId(fi->postedId), postedGroup)) {
if (IS_GROUP_PUBLISHER(postedGroup.mMeta.mSubscribeFlags) && IS_GROUP_ADMIN(postedGroup.mMeta.mSubscribeFlags)) {
postedId = fi->postedId;
postedAuthorId = postedGroup.mMeta.mAuthorId;
if (postedAuthorId.isNull()) {
errorState = RS_FEED_ERRORSTATE_PROCESS_POSTED_NO_AUTHOR;
}
} else {
errorState = RS_FEED_ERRORSTATE_PROCESS_POSTED_NO_ADMIN;
}
} else {
errorState = RS_FEED_ERRORSTATE_PROCESS_POSTED_NOT_FOUND;
}
} else {
std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - posted id is empty (" << fi->name << ")" << std::endl;
errorState = RS_FEED_ERRORSTATE_PROCESS_POSTED_NOT_FOUND;
}
} else {
std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - can't process posted, member mPosted is not set" << std::endl;
}
}
/* process msgs */
if (errorState == RS_FEED_ERRORSTATE_OK) {
/* process msgs */
@ -1949,9 +2029,14 @@ void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedRea
} else {
rs_sprintf(miNew->msgId, "%lu", mNextMsgId++);
}
if (forum) {
if (forum || posted) {
miNew->flag = RS_FEEDMSG_FLAG_DELETED;
forumMsgs.push_back(*miNew);
if (forum) {
forumMsgs.push_back(*miNew);
}
if (posted) {
postedMsgs.push_back(*miNew);
}
miNew->description.clear();
miNew->descriptionTransformed.clear();
} else {
@ -1996,7 +2081,7 @@ void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedRea
RsGxsForumMsg forumMsg;
forumMsg.mMeta.mGroupId = RsGxsGroupId(forumId);
forumMsg.mMeta.mMsgName = mi.title;
forumMsg.mMeta.mAuthorId = authorId;
forumMsg.mMeta.mAuthorId = forumAuthorId;
std::string description = mi.descriptionTransformed.empty() ? mi.description : mi.descriptionTransformed;
/* add link */
@ -2006,7 +2091,7 @@ void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedRea
forumMsg.mMsg = description;
uint32_t token;
if (mForums->createMsg(token, forumMsg) && waitForToken(token)) {
if (mForums->createMsg(token, forumMsg) && waitForToken(mForums, token)) {
RsGxsGrpMsgIdPair msgPair;
if (mForums->acknowledgeMsg(token, msgPair)) {
/* set to new */
@ -2026,6 +2111,67 @@ void p3FeedReader::onProcessSuccess_addMsgs(uint32_t feedId, std::list<RsFeedRea
}
}
if (!postedId.empty() && !postedMsgs.empty()) {
if (mPosted) {
/* a bit tricky */
RsGenExchange *genExchange = dynamic_cast<RsGenExchange*>(mPosted);
if (genExchange) {
/* add messages as posted messages */
std::list<RsFeedReaderMsg>::iterator msgIt;
for (msgIt = postedMsgs.begin(); msgIt != postedMsgs.end(); ++msgIt) {
RsFeedReaderMsg &mi = *msgIt;
/* convert to posted messages */
RsPostedPost postedPost;
postedPost.mMeta.mGroupId = RsGxsGroupId(postedId);
postedPost.mMeta.mMsgName = mi.title;
postedPost.mMeta.mAuthorId = postedAuthorId;
postedPost.mLink = mi.link;
std::string description;
if (feedFlag & RS_FEED_FLAG_POSTED_FIRST_IMAGE) {
if (!mi.postedFirstImage.empty()) {
/* use first image as image for posted and description without image as notes */
postedPost.mImage.copy(mi.postedFirstImage.data(), mi.postedFirstImage.size());
if (feedFlag & RS_FEED_FLAG_POSTED_ONLY_IMAGE) {
/* ignore description */
} else {
description = mi.postedDescriptionWithoutFirstImage;
}
} else {
if (feedFlag & RS_FEED_FLAG_POSTED_ONLY_IMAGE) {
/* ignore messages without image */
continue;
}
description = mi.descriptionTransformed.empty() ? mi.description : mi.descriptionTransformed;
}
} else {
description = mi.descriptionTransformed.empty() ? mi.description : mi.descriptionTransformed;
}
postedPost.mNotes = description;
uint32_t token;
if (mPosted->createPost(token, postedPost) && waitForToken(mPosted, token)) {
RsGxsGrpMsgIdPair msgPair;
if (mPosted->acknowledgeMsg(token, msgPair)) {
/* set to new */
genExchange->setMsgStatusFlags(token, msgPair, GXS_SERV::GXS_MSG_STATUS_GUI_NEW | GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD, GXS_SERV::GXS_MSG_STATUS_GUI_NEW | GXS_SERV::GXS_MSG_STATUS_GUI_UNREAD);
}
} else {
#ifdef FEEDREADER_DEBUG
std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - can't add posted message " << mi.title << " for feed " << postedId << std::endl;
#endif
}
}
} else {
std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - can't process posted, member mPosted is not derived from RsGenExchange" << std::endl;
}
} else {
std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - can't process posted, member mPosted is not set" << std::endl;
}
}
if (mNotify) {
mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_MOD);
@ -2080,6 +2226,9 @@ void p3FeedReader::setFeedInfo(uint32_t feedId, const std::string &name, const s
std::string forumId;
std::string forumName;
std::string forumDescription;
std::string postedId;
std::string postedName;
std::string postedDescription;
{
RsStackMutex stack(mFeedReaderMtx); /******* LOCK STACK MUTEX *********/
@ -2118,6 +2267,14 @@ void p3FeedReader::setFeedInfo(uint32_t feedId, const std::string &name, const s
forumDescription = fi->description;
forumName.insert(0, FEEDREADER_FORUM_PREFIX);
}
if ((fi->flag & RS_FEED_FLAG_POSTED) && (fi->flag & RS_FEED_FLAG_UPDATE_POSTED_INFO) && !fi->postedId.empty() && !preview) {
/* change posted too */
postedId = fi->postedId;
postedName = fi->name;
postedDescription = fi->description;
postedName.insert(0, FEEDREADER_POSTED_PREFIX);
}
}
if (changed) {
@ -2137,6 +2294,14 @@ void p3FeedReader::setFeedInfo(uint32_t feedId, const std::string &name, const s
}
//TODO: error
}
if (!postedId.empty()) {
RsPostedGroup postedGroup;
if (getPostedGroup(RsGxsGroupId(postedId), postedGroup)) {
updatePostedGroup(postedGroup, postedName, postedDescription);
}
//TODO: error
}
}
bool p3FeedReader::getForumGroup(const RsGxsGroupId &groupId, RsGxsForumGroup &forumGroup)
@ -2159,7 +2324,7 @@ bool p3FeedReader::getForumGroup(const RsGxsGroupId &groupId, RsGxsForumGroup &f
uint32_t token;
mForums->getTokenService()->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_SUMMARY, opts, grpIds);
if (!waitForToken(token)) {
if (!waitForToken(mForums, token)) {
std::cerr << "p3FeedReader::getForumGroup - waitForToken for request failed" << std::endl;
return false;
}
@ -2202,7 +2367,7 @@ bool p3FeedReader::updateForumGroup(const RsGxsForumGroup &forumGroup, const std
return false;
}
if (!waitForToken(token)) {
if (!waitForToken(mForums, token)) {
std::cerr << "p3FeedReader::updateForumGroup - waitForToken for update failed" << std::endl;
return false;
}
@ -2211,13 +2376,85 @@ bool p3FeedReader::updateForumGroup(const RsGxsForumGroup &forumGroup, const std
return true;
}
bool p3FeedReader::waitForToken(uint32_t token)
bool p3FeedReader::getPostedGroup(const RsGxsGroupId &groupId, RsPostedGroup &postedGroup)
{
if (!mForums) {
if (!mPosted) {
std::cerr << "p3FeedReader::getPostedGroup - can't get posted group " << groupId.toStdString() << ", member mPosted is not set" << std::endl;
return false;
}
RsTokenService *service = mForums->getTokenService();
if (groupId.isNull()) {
std::cerr << "p3FeedReader::getPostedGroup - group id is not valid" << std::endl;
return false;
}
std::list<RsGxsGroupId> grpIds;
grpIds.push_back(groupId);
RsTokReqOptions opts;
opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA;
uint32_t token;
mPosted->getTokenService()->requestGroupInfo(token, RS_TOKREQ_ANSTYPE_SUMMARY, opts, grpIds);
if (!waitForToken(mPosted, token)) {
std::cerr << "p3FeedReader::getPostedGroup - waitForToken for request failed" << std::endl;
return false;
}
std::vector<RsPostedGroup> groups;
if (!mPosted->getGroupData(token, groups)) {
std::cerr << "p3FeedReader::getPostedGroup - Error getting data" << std::endl;
return false;
}
if (groups.size() != 1) {
std::cerr << "p3FeedReader::getPostedGroup - Wrong number of items" << std::endl;
return false;
}
postedGroup = groups[0];
return true;
}
bool p3FeedReader::updatePostedGroup(const RsPostedGroup &postedGroup, const std::string &groupName, const std::string &groupDescription)
{
if (!mPosted) {
std::cerr << "p3FeedReader::updatePostedGroup - can't change posted " << postedGroup.mMeta.mGroupId.toStdString() << ", member mPosted is not set" << std::endl;
return false;
}
if (postedGroup.mMeta.mGroupName == groupName && postedGroup.mDescription == groupDescription) {
/* No change */
return true;
}
RsPostedGroup newPostedGroup = postedGroup;
newPostedGroup.mMeta.mGroupName = groupName;
newPostedGroup.mDescription = groupDescription;
uint32_t token;
if (!mPosted->updateGroup(token, newPostedGroup)) {
std::cerr << "p3FeedReader::updatePostedGroup - can't change posted " << newPostedGroup.mMeta.mGroupId.toStdString() << std::endl;
return false;
}
if (!waitForToken(mPosted, token)) {
std::cerr << "p3FeedReader::updatePostedGroup - waitForToken for update failed" << std::endl;
return false;
}
/* Posted updated */
return true;
}
bool p3FeedReader::waitForToken(RsGxsIfaceHelper *interface, uint32_t token)
{
if (!interface) {
return false;
}
RsTokenService *service = interface->getTokenService();
int count = MAX_REQUEST_AGE * 2;
while (!mStopped) {

10
plugins/FeedReader/services/p3FeedReader.h
View file

@ -33,11 +33,14 @@ class p3FeedReaderThread;
class RsGxsForums;
struct RsGxsForumGroup;
class RsPosted;
struct RsPostedGroup;
class RsGxsIfaceHelper;
class p3FeedReader : public RsPQIService, public RsFeedReader
{
public:
p3FeedReader(RsPluginHandler *pgHandler, RsGxsForums *forums);
p3FeedReader(RsPluginHandler *pgHandler, RsGxsForums *forums, RsPosted *posted);
/****************** FeedReader Interface *************/
virtual void stop();
@ -92,7 +95,9 @@ public:
bool getForumGroup(const RsGxsGroupId &groupId, RsGxsForumGroup &forumGroup);
bool updateForumGroup(const RsGxsForumGroup &forumGroup, const std::string &groupName, const std::string &groupDescription);
bool waitForToken(uint32_t token);
bool getPostedGroup(const RsGxsGroupId &groupId, RsPostedGroup &postedGroup);
bool updatePostedGroup(const RsPostedGroup &postedGroup, const std::string &groupName, const std::string &groupDescription);
bool waitForToken(RsGxsIfaceHelper *interface, uint32_t token);
protected:
/****************** p3Config STUFF *******************/
@ -109,6 +114,7 @@ private:
private:
time_t mLastClean;
RsGxsForums *mForums;
RsPosted *mPosted;
RsFeedReaderNotify *mNotify;
volatile bool mStopped;

26
plugins/FeedReader/services/p3FeedReaderThread.cc
View file

@ -1076,12 +1076,15 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
if (isRunning()) {
/* process description */
bool processPostedFirstImage = (feed.flag & RS_FEED_FLAG_POSTED_FIRST_IMAGE) ? TRUE : FALSE;
//long todo; // encoding
HTMLWrapper html;
if (html.readHTML(msg->description.c_str(), url.c_str())) {
xmlNodePtr root = html.getRootElement();
if (root) {
std::list<xmlNodePtr> nodesToDelete;
xmlNodePtr postedFirstImageNode = NULL;
/* process all children */
std::list<xmlNodePtr> nodes;
@ -1212,6 +1215,12 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
rs_sprintf(imageBase64, "data:%s;base64,%s", contentType.c_str(), base64.c_str());
if (html.setAttr(node, "src", imageBase64.c_str())) {
removeImage = false;
if (processPostedFirstImage && postedFirstImageNode == NULL) {
/* set first image */
msg->postedFirstImage = data;
postedFirstImageNode = node;
}
}
}
}
@ -1247,7 +1256,22 @@ RsFeedReaderErrorState p3FeedReaderThread::processMsg(const RsFeedReaderFeed &fe
if (result == RS_FEED_ERRORSTATE_OK) {
if (isRunning()) {
if (!html.saveHTML(msg->description)) {
if (html.saveHTML(msg->description)) {
if (postedFirstImageNode) {
/* Remove first image and create description without the image */
xmlUnlinkNode(postedFirstImageNode);
xmlFreeNode(postedFirstImageNode);
if (!html.saveHTML(msg->postedDescriptionWithoutFirstImage)) {
errorString = html.lastError();
#ifdef FEEDREADER_DEBUG
std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") cannot dump html" << std::endl;
std::cerr << " Error: " << errorString << std::endl;
#endif
result = RS_FEED_ERRORSTATE_PROCESS_INTERNAL_ERROR;
}
}
} else {
errorString = html.lastError();
#ifdef FEEDREADER_DEBUG
std::cerr << "p3FeedReaderThread::processHTML - feed " << feed.feedId << " (" << feed.name << ") cannot dump html" << std::endl;

8
plugins/FeedReader/services/rsFeedReaderItems.cc
View file

@ -46,6 +46,7 @@ void RsFeedReaderFeed::clear()
storageTime = 0;
flag = 0;
forumId.clear();
postedId.clear();
description.clear();
icon.clear();
errorState = RS_FEED_ERRORSTATE_OK;
@ -85,6 +86,7 @@ uint32_t RsFeedReaderSerialiser::sizeFeed(RsFeedReaderFeed *item)
s += item->xpathsToUse.TlvSize();
s += item->xpathsToRemove.TlvSize();
s += GetTlvStringSize(item->xslt);
s += GetTlvStringSize(item->postedId);
return s;
}
@ -108,7 +110,7 @@ bool RsFeedReaderSerialiser::serialiseFeed(RsFeedReaderFeed *item, void *data, u
offset += 8;
/* add values */
ok &= setRawUInt16(data, tlvsize, &offset, 2); /* version */
ok &= setRawUInt16(data, tlvsize, &offset, 3); /* version */
ok &= setRawUInt32(data, tlvsize, &offset, item->feedId);
ok &= setRawUInt32(data, tlvsize, &offset, item->parentId);
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_LINK, item->url);
@ -124,6 +126,7 @@ bool RsFeedReaderSerialiser::serialiseFeed(RsFeedReaderFeed *item, void *data, u
ok &= setRawUInt32(data, tlvsize, &offset, item->storageTime);
ok &= setRawUInt32(data, tlvsize, &offset, item->flag);
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_VALUE, item->forumId);
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_VALUE, item->postedId);
ok &= setRawUInt32(data, tlvsize, &offset, item->errorState);
ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_VALUE, item->errorString);
ok &= setRawUInt32(data, tlvsize, &offset, item->transformationType);
@ -208,6 +211,9 @@ RsFeedReaderFeed *RsFeedReaderSerialiser::deserialiseFeed(void *data, uint32_t *
ok &= getRawUInt32(data, rssize, &offset, &(item->storageTime));
ok &= getRawUInt32(data, rssize, &offset, &(item->flag));
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_VALUE, item->forumId);
if (version >= 3) {
ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_VALUE, item->postedId);
}
uint32_t errorState = 0;
ok &= getRawUInt32(data, rssize, &offset, &errorState);
item->errorState = (RsFeedReaderErrorState) errorState;

31
plugins/FeedReader/services/rsFeedReaderItems.h
View file

@ -34,17 +34,21 @@ const uint8_t RS_PKT_SUBTYPE_FEEDREADER_MSG = 0x03;
/**************************************************************************/
#define RS_FEED_FLAG_FOLDER 0x001
#define RS_FEED_FLAG_INFO_FROM_FEED 0x002
#define RS_FEED_FLAG_STANDARD_STORAGE_TIME 0x004
#define RS_FEED_FLAG_STANDARD_UPDATE_INTERVAL 0x008
#define RS_FEED_FLAG_STANDARD_PROXY 0x010
#define RS_FEED_FLAG_AUTHENTICATION 0x020
#define RS_FEED_FLAG_DEACTIVATED 0x040
#define RS_FEED_FLAG_FORUM 0x080
#define RS_FEED_FLAG_UPDATE_FORUM_INFO 0x100
#define RS_FEED_FLAG_EMBED_IMAGES 0x200
#define RS_FEED_FLAG_SAVE_COMPLETE_PAGE 0x400
#define RS_FEED_FLAG_FOLDER 0x0001
#define RS_FEED_FLAG_INFO_FROM_FEED 0x0002
#define RS_FEED_FLAG_STANDARD_STORAGE_TIME 0x0004
#define RS_FEED_FLAG_STANDARD_UPDATE_INTERVAL 0x0008
#define RS_FEED_FLAG_STANDARD_PROXY 0x0010
#define RS_FEED_FLAG_AUTHENTICATION 0x0020
#define RS_FEED_FLAG_DEACTIVATED 0x0040
#define RS_FEED_FLAG_FORUM 0x0080
#define RS_FEED_FLAG_UPDATE_FORUM_INFO 0x0100
#define RS_FEED_FLAG_EMBED_IMAGES 0x0200
#define RS_FEED_FLAG_SAVE_COMPLETE_PAGE 0x0400
#define RS_FEED_FLAG_POSTED 0x0800
#define RS_FEED_FLAG_UPDATE_POSTED_INFO 0x1000
#define RS_FEED_FLAG_POSTED_FIRST_IMAGE 0x2000
#define RS_FEED_FLAG_POSTED_ONLY_IMAGE 0x4000
class RsFeedReaderFeed : public RsItem
{
@ -76,6 +80,7 @@ public:
time_t lastUpdate;
uint32_t flag; // RS_FEED_FLAG_...
std::string forumId;
std::string postedId;
uint32_t storageTime;
std::string description;
std::string icon;
@ -118,6 +123,10 @@ public:
std::string descriptionTransformed;
time_t pubDate;
uint32_t flag; // RS_FEEDMSG_FLAG_...
// Only in memory when receiving messages
std::vector<unsigned char> postedFirstImage;
std::string postedDescriptionWithoutFirstImage;
};
class RsFeedReaderSerialiser: public RsSerialType