From cedbd051ac53170353a1cedc4a6b8f848f619c2c Mon Sep 17 00:00:00 2001 From: thunder2 Date: Tue, 4 Feb 2014 22:06:33 +0000 Subject: [PATCH] Deactivated code for old forum handling in FeedReader plugin git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7091 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- plugins/FeedReader/FeedReaderPlugin.cpp | 3 +- plugins/FeedReader/gui/AddFeedDialog.cpp | 50 +++--- plugins/FeedReader/services/p3FeedReader.cc | 177 +++++++++++--------- plugins/FeedReader/services/p3FeedReader.h | 3 + 4 files changed, 127 insertions(+), 106 deletions(-) diff --git a/plugins/FeedReader/FeedReaderPlugin.cpp b/plugins/FeedReader/FeedReaderPlugin.cpp index 8efae4674..53e2888a1 100644 --- a/plugins/FeedReader/FeedReaderPlugin.cpp +++ b/plugins/FeedReader/FeedReaderPlugin.cpp @@ -113,7 +113,8 @@ FeedNotify *FeedReaderPlugin::qt_feedNotify() RsPQIService *FeedReaderPlugin::rs_pqi_service() const { if (mFeedReader == NULL) { - mFeedReader = new p3FeedReader(mPlugInHandler, mInterfaces.mForums); + //Todo: Replace with gxs forums + mFeedReader = new p3FeedReader(mPlugInHandler, NULL /*mInterfaces.mForums*/); rsFeedReader = mFeedReader; mNotify = new FeedReaderNotify(); diff --git a/plugins/FeedReader/gui/AddFeedDialog.cpp b/plugins/FeedReader/gui/AddFeedDialog.cpp index 8e0ba0f74..f28c5a24b 100644 --- a/plugins/FeedReader/gui/AddFeedDialog.cpp +++ b/plugins/FeedReader/gui/AddFeedDialog.cpp @@ -29,12 +29,13 @@ #include "FeedReaderStringDefs.h" #include "gui/settings/rsharesettings.h" -#include "retroshare/rsforums.h" +//Todo: Replace with gxs forums +//#include "retroshare/rsforums.h" -bool sortForumInfo(const ForumInfo& info1, const ForumInfo& info2) -{ - return QString::fromStdWString(info1.forumName).compare(QString::fromStdWString(info2.forumName), Qt::CaseInsensitive); -} +//bool sortForumInfo(const ForumInfo& info1, const ForumInfo& info2) +//{ +// return QString::fromStdWString(info1.forumName).compare(QString::fromStdWString(info2.forumName), Qt::CaseInsensitive); +//} AddFeedDialog::AddFeedDialog(RsFeedReader *feedReader, FeedReaderNotify *notify, QWidget *parent) : QDialog(parent, Qt::Window), mFeedReader(feedReader), mNotify(notify), ui(new Ui::AddFeedDialog) @@ -81,17 +82,18 @@ AddFeedDialog::AddFeedDialog(RsFeedReader *feedReader, FeedReaderNotify *notify, ui->transformationTypeLabel->setText(FeedReaderStringDefs::transforationTypeString(mTransformationType)); /* fill own forums */ - std::list forumList; - if (rsForums->getForumList(forumList)) { - forumList.sort(sortForumInfo); - for (std::list::iterator it = forumList.begin(); it != forumList.end(); ++it) { - ForumInfo &forumInfo = *it; - /* show only own anonymous forums */ - if ((forumInfo.subscribeFlags & RS_DISTRIB_ADMIN) && (forumInfo.forumFlags & RS_DISTRIB_AUTHEN_ANON)) { - ui->forumComboBox->addItem(QString::fromStdWString(forumInfo.forumName), QString::fromStdString(forumInfo.forumId)); - } - } - } + //Todo: Replace with gxs forums +// std::list forumList; +// if (rsForums->getForumList(forumList)) { +// forumList.sort(sortForumInfo); +// for (std::list::iterator it = forumList.begin(); it != forumList.end(); ++it) { +// ForumInfo &forumInfo = *it; +// /* show only own anonymous forums */ +// if ((forumInfo.subscribeFlags & RS_DISTRIB_ADMIN) && (forumInfo.forumFlags & RS_DISTRIB_AUTHEN_ANON)) { +// ui->forumComboBox->addItem(QString::fromStdWString(forumInfo.forumName), QString::fromStdString(forumInfo.forumId)); +// } +// } +// } /* insert item to create a new forum */ ui->forumComboBox->insertItem(0, tr("Create a new anonymous public forum"), ""); ui->forumComboBox->setCurrentIndex(0); @@ -102,6 +104,9 @@ AddFeedDialog::AddFeedDialog(RsFeedReader *feedReader, FeedReaderNotify *notify, /* load settings */ processSettings(true); + + //Todo: Replace with gxs forums + ui->typeForumRadio->setEnabled(false); } AddFeedDialog::~AddFeedDialog() @@ -236,12 +241,13 @@ bool AddFeedDialog::fillFeed(const std::string &feedId) if (feedInfo.forumId.empty()) { ui->forumNameLabel->setText(tr("Not yet created")); } else { - ForumInfo forumInfo; - if (rsForums->getForumInfo(feedInfo.forumId, forumInfo)) { - ui->forumNameLabel->setText(QString::fromStdWString(forumInfo.forumName)); - } else { - ui->forumNameLabel->setText(tr("Unknown forum")); - } + //Todo: Replace with gxs forums +// ForumInfo forumInfo; +// if (rsForums->getForumInfo(feedInfo.forumId, forumInfo)) { +// ui->forumNameLabel->setText(QString::fromStdWString(forumInfo.forumName)); +// } else { +// ui->forumNameLabel->setText(tr("Unknown forum")); +// } } } else { ui->typeLocalRadio->setChecked(true); diff --git a/plugins/FeedReader/services/p3FeedReader.cc b/plugins/FeedReader/services/p3FeedReader.cc index 60d9a836a..9b0c318c2 100644 --- a/plugins/FeedReader/services/p3FeedReader.cc +++ b/plugins/FeedReader/services/p3FeedReader.cc @@ -24,7 +24,8 @@ #include "p3FeedReaderThread.h" #include "serialiser/rsconfigitems.h" #include "retroshare/rsiface.h" -#include "retroshare/rsforums.h" +//Todo: Replace with gxs forums +//#include "retroshare/rsforums.h" #include "util/rsstring.h" RsFeedReader *rsFeedReader = NULL; @@ -461,7 +462,8 @@ RsFeedAddResult p3FeedReader::addFeed(const FeedInfo &feedInfo, std::string &fee RsFeedAddResult p3FeedReader::setFeed(const std::string &feedId, const FeedInfo &feedInfo) { std::string forumId; - ForumInfo forumInfo; + //Todo: Replace with gxs forums +// ForumInfo forumInfo; { RsStackMutex stack(mFeedReaderMtx); /******* LOCK STACK MUTEX *********/ @@ -509,14 +511,15 @@ RsFeedAddResult p3FeedReader::setFeed(const std::string &feedId, const FeedInfo infoToFeed(feedInfo, fi, false); - if ((fi->flag & RS_FEED_FLAG_FORUM) && (fi->flag & RS_FEED_FLAG_UPDATE_FORUM_INFO) && !fi->forumId.empty() && - (fi->name != oldName || fi->description != oldDescription)) { - /* name or description changed, update forum */ - forumId = fi->forumId; - librs::util::ConvertUtf8ToUtf16(fi->name, forumInfo.forumName); - librs::util::ConvertUtf8ToUtf16(fi->description, forumInfo.forumDesc); - forumInfo.forumName.insert(0, FEEDREADER_FORUM_PREFIX); - } + //Todo: Replace with gxs forums +// if ((fi->flag & RS_FEED_FLAG_FORUM) && (fi->flag & RS_FEED_FLAG_UPDATE_FORUM_INFO) && !fi->forumId.empty() && +// (fi->name != oldName || fi->description != oldDescription)) { +// /* name or description changed, update forum */ +// forumId = fi->forumId; +// librs::util::ConvertUtf8ToUtf16(fi->name, forumInfo.forumName); +// librs::util::ConvertUtf8ToUtf16(fi->description, forumInfo.forumDesc); +// forumInfo.forumName.insert(0, FEEDREADER_FORUM_PREFIX); +// } } IndicateConfigChanged(); @@ -525,18 +528,19 @@ RsFeedAddResult p3FeedReader::setFeed(const std::string &feedId, const FeedInfo mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_MOD); } - if (!forumId.empty()) { - if (mForums) { - /* name or description changed, update forum */ - if (!mForums->setForumInfo(forumId, forumInfo)) { -#ifdef FEEDREADER_DEBUG - std::cerr << "p3FeedReader::setFeed - can't change forum " << forumId << std::endl; -#endif - } - } else { - std::cerr << "p3FeedReader::setFeed - can't change forum " << forumId << ", member mForums is not set" << std::endl; - } - } + //Todo: Replace with gxs forums +// if (!forumId.empty()) { +// if (mForums) { +// /* name or description changed, update forum */ +// if (!mForums->setForumInfo(forumId, forumInfo)) { +//#ifdef FEEDREADER_DEBUG +// std::cerr << "p3FeedReader::setFeed - can't change forum " << forumId << std::endl; +//#endif +// } +// } else { +// std::cerr << "p3FeedReader::setFeed - can't change forum " << forumId << ", member mForums is not set" << std::endl; +// } +// } return RS_FEED_ADD_RESULT_SUCCESS; } @@ -1840,6 +1844,8 @@ void p3FeedReader::onProcessSuccess_addMsgs(const std::string &feedId, std::list bool forum = (fi->flag & RS_FEED_FLAG_FORUM) && !fi->preview; RsFeedReaderErrorState errorState = RS_FEED_ERRORSTATE_OK; +//Todo: Replace with gxs forums +#if 0 if (forum && !msgs.empty()) { if (mForums) { if (fi->forumId.empty()) { @@ -1896,6 +1902,7 @@ void p3FeedReader::onProcessSuccess_addMsgs(const std::string &feedId, std::list std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - can't process forum, member mForums is not set" << std::endl; } } +#endif /* process msgs */ if (errorState == RS_FEED_ERRORSTATE_OK) { @@ -1946,38 +1953,39 @@ void p3FeedReader::onProcessSuccess_addMsgs(const std::string &feedId, std::list } } - if (!forumId.empty() && !forumMsgs.empty()) { - if (mForums) { - /* add messages as forum messages */ - std::list::iterator msgIt; - for (msgIt = forumMsgs.begin(); msgIt != forumMsgs.end(); ++msgIt) { - RsFeedReaderMsg &mi = *msgIt; + //Todo: Replace with gxs forums +// if (!forumId.empty() && !forumMsgs.empty()) { +// if (mForums) { +// /* add messages as forum messages */ +// std::list::iterator msgIt; +// for (msgIt = forumMsgs.begin(); msgIt != forumMsgs.end(); ++msgIt) { +// RsFeedReaderMsg &mi = *msgIt; - /* convert to forum messages */ - ForumMsgInfo forumMsgInfo; - forumMsgInfo.forumId = forumId; - librs::util::ConvertUtf8ToUtf16(mi.title, forumMsgInfo.title); +// /* convert to forum messages */ +// ForumMsgInfo forumMsgInfo; +// forumMsgInfo.forumId = forumId; +// librs::util::ConvertUtf8ToUtf16(mi.title, forumMsgInfo.title); - std::string description = mi.descriptionTransformed.empty() ? mi.description : mi.descriptionTransformed; - /* add link */ - if (!mi.link.empty()) { - description += "
" + mi.link + ""; - } - librs::util::ConvertUtf8ToUtf16(description, forumMsgInfo.msg); +// std::string description = mi.descriptionTransformed.empty() ? mi.description : mi.descriptionTransformed; +// /* add link */ +// if (!mi.link.empty()) { +// description += "
" + mi.link + ""; +// } +// librs::util::ConvertUtf8ToUtf16(description, forumMsgInfo.msg); - if (mForums->ForumMessageSend(forumMsgInfo)) { - /* set to new */ - mForums->setMessageStatus(forumMsgInfo.forumId, forumMsgInfo.msgId, 0, FORUM_MSG_STATUS_MASK); - } else { -#ifdef FEEDREADER_DEBUG - std::cerr << "p3FeedReader::onProcessSuccess_filterMsg - can't add forum message " << mi.title << " for feed " << forumId << std::endl; -#endif - } - } - } else { - std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - can't process forum, member mForums is not set" << std::endl; - } - } +// if (mForums->ForumMessageSend(forumMsgInfo)) { +// /* set to new */ +// mForums->setMessageStatus(forumMsgInfo.forumId, forumMsgInfo.msgId, 0, FORUM_MSG_STATUS_MASK); +// } else { +//#ifdef FEEDREADER_DEBUG +// std::cerr << "p3FeedReader::onProcessSuccess_filterMsg - can't add forum message " << mi.title << " for feed " << forumId << std::endl; +//#endif +// } +// } +// } else { +// std::cerr << "p3FeedReader::onProcessSuccess_addMsgs - can't process forum, member mForums is not set" << std::endl; +// } +// } if (mNotify) { mNotify->notifyFeedChanged(feedId, NOTIFY_TYPE_MOD); @@ -2031,7 +2039,8 @@ void p3FeedReader::setFeedInfo(const std::string &feedId, const std::string &nam bool changed = false; bool preview; std::string forumId; - ForumInfo forumInfoNew; + //Todo: Replace with gxs forums +// ForumInfo forumInfoNew; { RsStackMutex stack(mFeedReaderMtx); /******* LOCK STACK MUTEX *********/ @@ -2063,13 +2072,14 @@ void p3FeedReader::setFeedInfo(const std::string &feedId, const std::string &nam changed = true; } - if ((fi->flag & RS_FEED_FLAG_FORUM) && (fi->flag & RS_FEED_FLAG_UPDATE_FORUM_INFO) && !fi->forumId.empty() && !preview) { - /* change forum too */ - forumId = fi->forumId; - librs::util::ConvertUtf8ToUtf16(fi->name, forumInfoNew.forumName); - librs::util::ConvertUtf8ToUtf16(fi->description, forumInfoNew.forumDesc); - forumInfoNew.forumName.insert(0, FEEDREADER_FORUM_PREFIX); - } + //Todo: Replace with gxs forums +// if ((fi->flag & RS_FEED_FLAG_FORUM) && (fi->flag & RS_FEED_FLAG_UPDATE_FORUM_INFO) && !fi->forumId.empty() && !preview) { +// /* change forum too */ +// forumId = fi->forumId; +// librs::util::ConvertUtf8ToUtf16(fi->name, forumInfoNew.forumName); +// librs::util::ConvertUtf8ToUtf16(fi->description, forumInfoNew.forumDesc); +// forumInfoNew.forumName.insert(0, FEEDREADER_FORUM_PREFIX); +// } } if (changed) { @@ -2082,28 +2092,29 @@ void p3FeedReader::setFeedInfo(const std::string &feedId, const std::string &nam } } - if (!forumId.empty()) { - if (mForums) { - ForumInfo forumInfo; - if (mForums->getForumInfo(forumId, forumInfo)) { - if (forumInfo.forumName != forumInfoNew.forumName || forumInfo.forumDesc != forumInfoNew.forumDesc) { - /* name or description changed, update forum */ -#ifdef FEEDREADER_DEBUG - std::cerr << "p3FeedReader::setFeed - change forum " << forumId << std::endl; -#endif - if (!mForums->setForumInfo(forumId, forumInfoNew)) { -#ifdef FEEDREADER_DEBUG - std::cerr << "p3FeedReader::setFeed - can't change forum " << forumId << std::endl; -#endif - } - } - } else { -#ifdef FEEDREADER_DEBUG - std::cerr << "p3FeedReader::setFeed - can't get forum info " << forumId << std::endl; -#endif - } - } else { - std::cerr << "p3FeedReader::setFeedInfo - can't process forum, member mForums is not set" << std::endl; - } - } + //Todo: Replace with gxs forums +// if (!forumId.empty()) { +// if (mForums) { +// ForumInfo forumInfo; +// if (mForums->getForumInfo(forumId, forumInfo)) { +// if (forumInfo.forumName != forumInfoNew.forumName || forumInfo.forumDesc != forumInfoNew.forumDesc) { +// /* name or description changed, update forum */ +//#ifdef FEEDREADER_DEBUG +// std::cerr << "p3FeedReader::setFeed - change forum " << forumId << std::endl; +//#endif +// if (!mForums->setForumInfo(forumId, forumInfoNew)) { +//#ifdef FEEDREADER_DEBUG +// std::cerr << "p3FeedReader::setFeed - can't change forum " << forumId << std::endl; +//#endif +// } +// } +// } else { +//#ifdef FEEDREADER_DEBUG +// std::cerr << "p3FeedReader::setFeed - can't get forum info " << forumId << std::endl; +//#endif +// } +// } else { +// std::cerr << "p3FeedReader::setFeedInfo - can't process forum, member mForums is not set" << std::endl; +// } +// } } diff --git a/plugins/FeedReader/services/p3FeedReader.h b/plugins/FeedReader/services/p3FeedReader.h index cd2c8859d..2de0a7832 100644 --- a/plugins/FeedReader/services/p3FeedReader.h +++ b/plugins/FeedReader/services/p3FeedReader.h @@ -30,6 +30,9 @@ class RsFeedReaderFeed; class RsFeedReaderMsg; class p3FeedReaderThread; +//Todo: Replace with gxs forums +class RsForums; + class p3FeedReader : public RsPQIService, public RsFeedReader { public: