Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

1/4 convertion of GxsGroupFrameDialog to blocking API

Browse Source
This commit is contained in:
csoler 2020-03-21 15:25:34 +01:00
parent 1a9ac16546
commit 2387150f64
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
18 changed files with 251 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libretroshare/src/gxs/rsdataservice.cc
View File

@ -25,6 +25,9 @@
* #define RS_DATA_SERVICE_DEBUG_TIME 1 * #define RS_DATA_SERVICE_DEBUG_TIME 1
* #define RS_DATA_SERVICE_DEBUG_CACHE 1 * #define RS_DATA_SERVICE_DEBUG_CACHE 1
****/ ****/
#define RS_DATA_SERVICE_DEBUG 1
#define RS_DATA_SERVICE_DEBUG_TIME 1
#define RS_DATA_SERVICE_DEBUG_CACHE 1
#include <fstream> #include <fstream>
#include <util/rsdir.h> #include <util/rsdir.h>
@ -1343,6 +1346,7 @@ int RsDataService::retrieveGxsMsgMetaData(const GxsMsgReq& reqIds, GxsMsgMetaRes
} }
#ifdef RS_DATA_SERVICE_DEBUG_TIME #ifdef RS_DATA_SERVICE_DEBUG_TIME
if(mDbName==std::string("gxsforums_db"))
std::cerr << "RsDataService::retrieveGxsMsgMetaData() " << mDbName << ", Requests: " << reqIds.size() << ", Results: " << resultCount << ", Time: " << timer.duration() << std::endl; std::cerr << "RsDataService::retrieveGxsMsgMetaData() " << mDbName << ", Requests: " << reqIds.size() << ", Results: " << resultCount << ", Time: " << timer.duration() << std::endl;
#endif #endif

1
libretroshare/src/gxs/rsgxsdataaccess.cc
View File

@ -29,6 +29,7 @@
/*********** /***********
* #define DATA_DEBUG 1 * #define DATA_DEBUG 1
**********/ **********/
#define DATA_DEBUG 1
RsGxsDataAccess::RsGxsDataAccess(RsGeneralDataService* ds) : RsGxsDataAccess::RsGxsDataAccess(RsGeneralDataService* ds) :
mDataStore(ds), mDataMutex("RsGxsDataAccess"), mNextToken(0) {} mDataStore(ds), mDataMutex("RsGxsDataAccess"), mNextToken(0) {}

3
libretroshare/src/retroshare/rsgxschannels.h
View File

@ -45,11 +45,10 @@ class RsGxsChannels;
extern RsGxsChannels* rsGxsChannels; extern RsGxsChannels* rsGxsChannels;
struct RsGxsChannelGroup : RsSerializable struct RsGxsChannelGroup : RsSerializable, RsGxsGenericGroupData
{ {
RsGxsChannelGroup() : mAutoDownload(false) {} RsGxsChannelGroup() : mAutoDownload(false) {}
RsGroupMetaData mMeta;
std::string mDescription; std::string mDescription;
RsGxsImage mImage; RsGxsImage mImage;

5
libretroshare/src/retroshare/rsgxsforums.h
View File

@ -54,11 +54,8 @@ static const uint32_t RS_GXS_FORUM_MSG_FLAGS_MODERATED = 0x00000001;
#define IS_FORUM_MSG_MODERATION(flags) (flags & RS_GXS_FORUM_MSG_FLAGS_MODERATED) #define IS_FORUM_MSG_MODERATION(flags) (flags & RS_GXS_FORUM_MSG_FLAGS_MODERATED)
struct RsGxsForumGroup : RsSerializable struct RsGxsForumGroup : RsSerializable, RsGxsGenericGroupData
{ {
/** Forum GXS metadata */
RsGroupMetaData mMeta;
/** @brief Forum desciption */ /** @brief Forum desciption */
std::string mDescription; std::string mDescription;

7
libretroshare/src/retroshare/rsgxsifacetypes.h
View File

@ -118,8 +118,15 @@ struct RsGroupMetaData : RsSerializable
} }
}; };
// This is the parent class of all interface-level GXS group data. Derived classes
// will include service-specific information, such as icon, description, etc
struct RsGxsGenericGroupData
{
virtual ~RsGxsGenericGroupData() = default; // making the type polymorphic
RsGroupMetaData mMeta;
};
struct RsMsgMetaData : RsSerializable struct RsMsgMetaData : RsSerializable
{ {

5
libretroshare/src/retroshare/rsposted.h
View File

@ -40,9 +40,8 @@ class RsPosted;
*/ */
extern RsPosted* rsPosted; extern RsPosted* rsPosted;
struct RsPostedGroup struct RsPostedGroup: RsGxsGenericGroupData
{ {
RsGroupMetaData mMeta;
std::string mDescription; std::string mDescription;
RsGxsImage mGroupImage; RsGxsImage mGroupImage;
}; };
@ -150,6 +149,8 @@ public:
const std::list<RsGxsGroupId>& boardsIds, const std::list<RsGxsGroupId>& boardsIds,
std::vector<RsPostedGroup>& boardsInfo ) = 0; std::vector<RsPostedGroup>& boardsInfo ) = 0;
virtual bool getBoardsSummaries(std::list<RsGroupMetaData>& groupInfo) =0;
virtual bool getBoardContent( virtual bool getBoardContent(
const RsGxsGroupId& boardId, const RsGxsGroupId& boardId,
const std::set<RsGxsMessageId>& contentsIds, const std::set<RsGxsMessageId>& contentsIds,

18
libretroshare/src/services/p3gxschannels.cc
View File

@ -1033,15 +1033,23 @@ bool p3GxsChannels::getChannelsSummaries(
return getGroupSummary(token, channels); return getGroupSummary(token, channels);
} }
bool p3GxsChannels::getChannelsInfo( bool p3GxsChannels::getChannelsInfo( const std::list<RsGxsGroupId>& chanIds, std::vector<RsGxsChannelGroup>& channelsInfo )
const std::list<RsGxsGroupId>& chanIds,
std::vector<RsGxsChannelGroup>& channelsInfo )
{ {
uint32_t token; uint32_t token;
RsTokReqOptions opts; RsTokReqOptions opts;
opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA; opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA;
if( !requestGroupInfo(token, opts, chanIds)
|| waitToken(token) != RsTokenService::COMPLETE ) return false; if(chanIds.empty())
{
if( !requestGroupInfo(token, opts) || waitToken(token) != RsTokenService::COMPLETE )
return false;
}
else
{
if( !requestGroupInfo(token, opts, chanIds) || waitToken(token) != RsTokenService::COMPLETE )
return false;
}
return getGroupData(token, channelsInfo) && !channelsInfo.empty(); return getGroupData(token, channelsInfo) && !channelsInfo.empty();
} }

17
libretroshare/src/services/p3gxsforums.cc
View File

@ -666,15 +666,22 @@ bool p3GxsForums::getForumsSummaries( std::list<RsGroupMetaData>& forums )
return getGroupSummary(token, forums); return getGroupSummary(token, forums);
} }
bool p3GxsForums::getForumsInfo( bool p3GxsForums::getForumsInfo( const std::list<RsGxsGroupId>& forumIds, std::vector<RsGxsForumGroup>& forumsInfo )
const std::list<RsGxsGroupId>& forumIds,
std::vector<RsGxsForumGroup>& forumsInfo )
{ {
uint32_t token; uint32_t token;
RsTokReqOptions opts; RsTokReqOptions opts;
opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA; opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA;
if( !requestGroupInfo(token, opts, forumIds)
|| waitToken(token,std::chrono::milliseconds(5000)) != RsTokenService::COMPLETE ) return false; if(forumIds.empty())
{
if( !requestGroupInfo(token, opts) || waitToken(token,std::chrono::milliseconds(5000)) != RsTokenService::COMPLETE )
return false;
}
else
{
if( !requestGroupInfo(token, opts, forumIds) || waitToken(token,std::chrono::milliseconds(5000)) != RsTokenService::COMPLETE )
return false;
}
return getGroupData(token, forumsInfo); return getGroupData(token, forumsInfo);
} }

10
libretroshare/src/services/p3posted.cc
View File

@ -330,5 +330,15 @@ bool p3Posted::getBoardContent( const RsGxsGroupId& groupId,
return getPostData(token, posts, comments); return getPostData(token, posts, comments);
} }
bool p3Posted::getBoardsSummaries(std::list<RsGroupMetaData>& boards )
{
uint32_t token;
RsTokReqOptions opts;
opts.mReqType = GXS_REQUEST_TYPE_GROUP_META;
if( !requestGroupInfo(token, opts) || waitToken(token) != RsTokenService::COMPLETE ) return false;
return getGroupSummary(token, boards);
}
RsPosted::~RsPosted() = default; RsPosted::~RsPosted() = default;
RsGxsPostedEvent::~RsGxsPostedEvent() = default; RsGxsPostedEvent::~RsGxsPostedEvent() = default;

2
libretroshare/src/services/p3posted.h
View File

@ -66,6 +66,8 @@ virtual void receiveHelperChanges(std::vector<RsGxsNotify*>& changes)
std::vector<RsPostedPost>& posts, std::vector<RsPostedPost>& posts,
std::vector<RsGxsComment>& comments ) override; std::vector<RsGxsComment>& comments ) override;
bool getBoardsSummaries(std::list<RsGroupMetaData>& groupInfo) override;
virtual bool getGroupData(const uint32_t &token, std::vector<RsPostedGroup> &groups); virtual bool getGroupData(const uint32_t &token, std::vector<RsPostedGroup> &groups);
virtual bool getPostData(const uint32_t &token, std::vector<RsPostedPost> &posts, std::vector<RsGxsComment> &cmts); virtual bool getPostData(const uint32_t &token, std::vector<RsPostedPost> &posts, std::vector<RsGxsComment> &cmts);
virtual bool getPostData(const uint32_t &token, std::vector<RsPostedPost> &posts) { std::vector<RsGxsComment> cmts; return getPostData( token, posts, cmts);} virtual bool getPostData(const uint32_t &token, std::vector<RsPostedPost> &posts) { std::vector<RsGxsComment> cmts; return getPostData( token, posts, cmts);}

44
retroshare-gui/src/gui/Posted/PostedDialog.cpp
View File

@ -150,6 +150,21 @@ QString PostedDialog::icon(IconType type)
return ""; return "";
} }
bool PostedDialog::getGroupData(std::list<RsGxsGenericGroupData*>& groupInfo)
{
std::vector<RsPostedGroup> groups;
// request all group infos at once
if(! rsPosted->getBoardsInfo(std::list<RsGxsGroupId>(),groups))
return false;
/* Save groups to fill icons and description */
for (auto& group: groups)
groupInfo.push_back(new RsPostedGroup(group));
}
GxsGroupDialog *PostedDialog::createNewGroupDialog(TokenQueue *tokenQueue) GxsGroupDialog *PostedDialog::createNewGroupDialog(TokenQueue *tokenQueue)
{ {
return new PostedGroupDialog(tokenQueue, this); return new PostedGroupDialog(tokenQueue, this);
@ -180,6 +195,7 @@ QWidget *PostedDialog::createCommentHeaderWidget(const RsGxsGroupId &grpId, cons
return new PostedItem(NULL, 0, grpId, msgId, true, false); return new PostedItem(NULL, 0, grpId, msgId, true, false);
} }
#ifdef TO_REMOVE
void PostedDialog::loadGroupSummaryToken(const uint32_t &token, std::list<RsGroupMetaData> &groupInfo, RsUserdata *&userdata) void PostedDialog::loadGroupSummaryToken(const uint32_t &token, std::list<RsGroupMetaData> &groupInfo, RsUserdata *&userdata)
{ {
std::vector<RsPostedGroup> groups; std::vector<RsPostedGroup> groups;
@ -205,25 +221,23 @@ void PostedDialog::loadGroupSummaryToken(const uint32_t &token, std::list<RsGrou
} }
} }
} }
#endif
void PostedDialog::groupInfoToGroupItemInfo(const RsGroupMetaData &groupInfo, GroupItemInfo &groupItemInfo, const RsUserdata *userdata) void PostedDialog::groupInfoToGroupItemInfo(const RsGxsGenericGroupData *groupData, GroupItemInfo &groupItemInfo)
{ {
GxsGroupFrameDialog::groupInfoToGroupItemInfo(groupInfo, groupItemInfo, userdata); GxsGroupFrameDialog::groupInfoToGroupItemInfo(groupData, groupItemInfo);
const PostedGroupInfoData *postedData = dynamic_cast<const PostedGroupInfoData*>(userdata); const RsPostedGroup *postedGroupData = dynamic_cast<const RsPostedGroup*>(groupData);
if (!postedData) {
std::cerr << "PostedDialog::groupInfoToGroupItemInfo() Failed to cast data to PostedGroupInfoData"; if (!postedGroupData)
std::cerr << std::endl; {
std::cerr << "PostedDialog::groupInfoToGroupItemInfo() Failed to cast data to RsPostedGroup"<< std::endl;
return; return;
} }
QMap<RsGxsGroupId, QString>::const_iterator descriptionIt = postedData->mDescription.find(groupInfo.mGroupId); QPixmap image;
if (descriptionIt != postedData->mDescription.end()) { GxsIdDetails::loadPixmapFromData(postedGroupData->mGroupImage.mData, postedGroupData->mGroupImage.mSize, image,GxsIdDetails::ORIGINAL);
groupItemInfo.description = descriptionIt.value();
} groupItemInfo.description = QString::fromUtf8(postedGroupData->mDescription.c_str());
groupItemInfo.icon = image;
QMap<RsGxsGroupId, QIcon>::const_iterator iconIt = postedData->mIcon.find(groupInfo.mGroupId);
if (iconIt != postedData->mIcon.end()) {
groupItemInfo.icon = iconIt.value();
}
} }

5
retroshare-gui/src/gui/Posted/PostedDialog.h
View File

@ -45,7 +45,9 @@ protected:
virtual QString getHelpString() const ; virtual QString getHelpString() const ;
virtual RetroShareLink::enumType getLinkType() { return RetroShareLink::TYPE_POSTED; } virtual RetroShareLink::enumType getLinkType() { return RetroShareLink::TYPE_POSTED; }
virtual GroupFrameSettings::Type groupFrameSettingsType() { return GroupFrameSettings::Posted; } virtual GroupFrameSettings::Type groupFrameSettingsType() { return GroupFrameSettings::Posted; }
virtual void groupInfoToGroupItemInfo(const RsGroupMetaData &groupInfo, GroupItemInfo &groupItemInfo, const RsUserdata *userdata);
void groupInfoToGroupItemInfo(const RsGxsGenericGroupData *groupData, GroupItemInfo &groupItemInfo) override;
bool getGroupData(std::list<RsGxsGenericGroupData*>& groupInfo) override;
private: private:
/* GxsGroupFrameDialog */ /* GxsGroupFrameDialog */
@ -59,7 +61,6 @@ private:
virtual RsGxsCommentService *getCommentService(); virtual RsGxsCommentService *getCommentService();
virtual QWidget *createCommentHeaderWidget(const RsGxsGroupId &grpId, const RsGxsMessageId &msgId); virtual QWidget *createCommentHeaderWidget(const RsGxsGroupId &grpId, const RsGxsMessageId &msgId);
virtual uint32_t requestGroupSummaryType() { return GXS_REQUEST_TYPE_GROUP_DATA; } // request complete group data virtual uint32_t requestGroupSummaryType() { return GXS_REQUEST_TYPE_GROUP_DATA; } // request complete group data
virtual void loadGroupSummaryToken(const uint32_t &token, std::list<RsGroupMetaData> &groupInfo, RsUserdata* &userdata);
void handleEvent_main_thread(std::shared_ptr<const RsEvent> event); void handleEvent_main_thread(std::shared_ptr<const RsEvent> event);
RsEventsHandlerId_t mEventHandlerId; RsEventsHandlerId_t mEventHandlerId;

133
retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.cpp
View File

@ -33,6 +33,8 @@
#include "gui/notifyqt.h" #include "gui/notifyqt.h"
#include "gui/common/UIStateHelper.h" #include "gui/common/UIStateHelper.h"
#include "gui/common/UserNotify.h" #include "gui/common/UserNotify.h"
#include "util/qtthreadsutils.h"
#include "retroshare/rsgxsifacetypes.h"
#include "GxsCommentDialog.h" #include "GxsCommentDialog.h"
//#define DEBUG_GROUPFRAMEDIALOG //#define DEBUG_GROUPFRAMEDIALOG
@ -134,7 +136,7 @@ void GxsGroupFrameDialog::getGroupList(std::map<RsGxsGroupId, RsGroupMetaData> &
group_list = mCachedGroupMetas ; group_list = mCachedGroupMetas ;
if(group_list.empty()) if(group_list.empty())
requestGroupSummary(); updateGroupSummary();
} }
void GxsGroupFrameDialog::initUi() void GxsGroupFrameDialog::initUi()
{ {
@ -242,7 +244,7 @@ void GxsGroupFrameDialog::setHideTabBarWithOneTab(bool hideTabBarWithOneTab)
void GxsGroupFrameDialog::updateDisplay(bool complete) void GxsGroupFrameDialog::updateDisplay(bool complete)
{ {
if(complete) // || !getGrpIds().empty() || !getGrpIdsMeta().empty()) { if(complete) // || !getGrpIds().empty() || !getGrpIdsMeta().empty()) {
requestGroupSummary(); /* Update group list */ updateGroupSummary(); /* Update group list */
updateSearchResults() ; updateSearchResults() ;
} }
@ -896,16 +898,16 @@ void GxsGroupFrameDialog::messageTabWaitingChanged(QWidget *widget)
} }
///***** INSERT GROUP LISTS *****/ ///***** INSERT GROUP LISTS *****/
void GxsGroupFrameDialog::groupInfoToGroupItemInfo(const RsGroupMetaData &groupInfo, GroupItemInfo &groupItemInfo, const RsUserdata */*userdata*/) void GxsGroupFrameDialog::groupInfoToGroupItemInfo(const RsGxsGenericGroupData *groupInfo, GroupItemInfo &groupItemInfo)
{ {
groupItemInfo.id = QString::fromStdString(groupInfo.mGroupId.toStdString()); groupItemInfo.id = QString::fromStdString(groupInfo->mMeta.mGroupId.toStdString());
groupItemInfo.name = QString::fromUtf8(groupInfo.mGroupName.c_str()); groupItemInfo.name = QString::fromUtf8(groupInfo->mMeta.mGroupName.c_str());
groupItemInfo.popularity = groupInfo.mPop; groupItemInfo.popularity = groupInfo->mMeta.mPop;
groupItemInfo.lastpost = QDateTime::fromTime_t(groupInfo.mLastPost); groupItemInfo.lastpost = QDateTime::fromTime_t(groupInfo->mMeta.mLastPost);
groupItemInfo.subscribeFlags = groupInfo.mSubscribeFlags; groupItemInfo.subscribeFlags = groupInfo->mMeta.mSubscribeFlags;
groupItemInfo.publishKey = IS_GROUP_PUBLISHER(groupInfo.mSubscribeFlags) ; groupItemInfo.publishKey = IS_GROUP_PUBLISHER(groupInfo->mMeta.mSubscribeFlags) ;
groupItemInfo.adminKey = IS_GROUP_ADMIN(groupInfo.mSubscribeFlags) ; groupItemInfo.adminKey = IS_GROUP_ADMIN(groupInfo->mMeta.mSubscribeFlags) ;
groupItemInfo.max_visible_posts = groupInfo.mVisibleMsgCount ; groupItemInfo.max_visible_posts = groupInfo->mMeta.mVisibleMsgCount ;
#if TOGXS #if TOGXS
if (groupInfo.mGroupFlags & RS_DISTRIB_AUTHEN_REQ) { if (groupInfo.mGroupFlags & RS_DISTRIB_AUTHEN_REQ) {
@ -919,7 +921,7 @@ void GxsGroupFrameDialog::groupInfoToGroupItemInfo(const RsGroupMetaData &groupI
} }
} }
void GxsGroupFrameDialog::insertGroupsData(const std::map<RsGxsGroupId,RsGroupMetaData> &groupList, const RsUserdata *userdata) void GxsGroupFrameDialog::insertGroupsData(const std::list<RsGxsGenericGroupData*>& groupList)
{ {
if (!mInitialized) { if (!mInitialized) {
return; return;
@ -933,54 +935,38 @@ void GxsGroupFrameDialog::insertGroupsData(const std::map<RsGxsGroupId,RsGroupMe
QList<GroupItemInfo> otherList; QList<GroupItemInfo> otherList;
std::multimap<uint32_t, GroupItemInfo> popMap; std::multimap<uint32_t, GroupItemInfo> popMap;
for (auto it = groupList.begin(); it != groupList.end(); ++it) { for (auto& g:groupList)
{
/* sort it into Publish (Own), Subscribed, Popular and Other */ /* sort it into Publish (Own), Subscribed, Popular and Other */
uint32_t flags = it->second.mSubscribeFlags; uint32_t flags = g->mMeta.mSubscribeFlags;
GroupItemInfo groupItemInfo; GroupItemInfo groupItemInfo;
groupInfoToGroupItemInfo(it->second, groupItemInfo, userdata); groupInfoToGroupItemInfo(g, groupItemInfo);
if (IS_GROUP_SUBSCRIBED(flags)) if (IS_GROUP_SUBSCRIBED(flags))
{ {
if (IS_GROUP_ADMIN(flags)) if (IS_GROUP_ADMIN(flags))
{
adminList.push_back(groupItemInfo); adminList.push_back(groupItemInfo);
}
else else
{ subList.push_back(groupItemInfo); /* subscribed group */
/* subscribed group */
subList.push_back(groupItemInfo);
}
} }
else else
{ popMap.insert(std::make_pair(g->mMeta.mLastPost, groupItemInfo)); /* rate the others by time of last post */
//popMap.insert(std::make_pair(it->mPop, groupItemInfo)); /* rate the others by popularity */
popMap.insert(std::make_pair(it->second.mLastPost, groupItemInfo)); /* rate the others by time of last post */
}
} }
/* iterate backwards through popMap - take the top 5 or 10% of list */ /* iterate backwards through popMap - take the top 5 or 10% of list */
uint32_t popCount = 5; uint32_t popCount = 5;
if (popCount < popMap.size() / 10) if (popCount < popMap.size() / 10)
{
popCount = popMap.size() / 10; popCount = popMap.size() / 10;
}
uint32_t i = 0; uint32_t i = 0;
std::multimap<uint32_t, GroupItemInfo>::reverse_iterator rit; std::multimap<uint32_t, GroupItemInfo>::reverse_iterator rit;
//uint32_t popLimit = 0;
//for(rit = popMap.rbegin(); ((rit != popMap.rend()) && (i < popCount)); ++rit, ++i) ;
//if (rit != popMap.rend()) {
// popLimit = rit->first;
//}
for (rit = popMap.rbegin(); rit != popMap.rend(); ++rit,++i) { for (rit = popMap.rbegin(); rit != popMap.rend(); ++rit,++i)
//if (rit->second.popularity > (int) popLimit) {
if(i < popCount) if(i < popCount)
popList.append(rit->second); popList.append(rit->second);
else else
otherList.append(rit->second); otherList.append(rit->second);
}
/* now we can add them in as a tree! */ /* now we can add them in as a tree! */
ui->groupTreeWidget->fillGroupItems(mYourGroups, adminList); ui->groupTreeWidget->fillGroupItems(mYourGroups, adminList);
@ -995,9 +981,8 @@ void GxsGroupFrameDialog::insertGroupsData(const std::map<RsGxsGroupId,RsGroupMe
mInFill = false; mInFill = false;
/* Re-fill group */ /* Re-fill group */
if (!ui->groupTreeWidget->activateId(QString::fromStdString(mGroupId.toStdString()), true)) { if (!ui->groupTreeWidget->activateId(QString::fromStdString(mGroupId.toStdString()), true))
mGroupId.clear(); mGroupId.clear();
}
updateMessageSummaryList(RsGxsGroupId()); updateMessageSummaryList(RsGxsGroupId());
} }
@ -1032,6 +1017,48 @@ void GxsGroupFrameDialog::updateMessageSummaryList(RsGxsGroupId groupId)
/** Request / Response of Data ********************************/ /** Request / Response of Data ********************************/
/*********************** **** **** **** ***********************/ /*********************** **** **** **** ***********************/
void GxsGroupFrameDialog::updateGroupSummary()
{
RsThread::async([this]()
{
std::list<RsGxsGenericGroupData*> groupInfo;
if(!getGroupData(groupInfo))
{
std::cerr << __PRETTY_FUNCTION__ << " failed to collect group info " << std::endl;
return;
}
RsQThreadUtils::postToObject( [this,groupInfo]()
{
/* Here it goes any code you want to be executed on the Qt Gui
* thread, for example to update the data model with new information
* after a blocking call to RetroShare API complete, note that
* Qt::QueuedConnection is important!
*/
insertGroupsData(groupInfo);
updateSearchResults();
mStateHelper->setLoading(TOKEN_TYPE_GROUP_SUMMARY, false);
if (!mNavigatePendingGroupId.isNull()) {
/* Navigate pending */
navigate(mNavigatePendingGroupId, mNavigatePendingMsgId);
mNavigatePendingGroupId.clear();
mNavigatePendingMsgId.clear();
}
// now delete the data that is not used anymore
for(auto& g:groupInfo)
delete g;
}, this );
});
}
#ifdef TO_REMOVE
void GxsGroupFrameDialog::requestGroupSummary() void GxsGroupFrameDialog::requestGroupSummary()
{ {
mStateHelper->setLoading(TOKEN_TYPE_GROUP_SUMMARY, true); mStateHelper->setLoading(TOKEN_TYPE_GROUP_SUMMARY, true);
@ -1056,37 +1083,14 @@ void GxsGroupFrameDialog::loadGroupSummaryToken(const uint32_t &token, std::list
mInterface->getGroupSummary(token, groupInfo); mInterface->getGroupSummary(token, groupInfo);
} }
void GxsGroupFrameDialog::loadGroupSummary(const uint32_t &token) void GxsGroupFrameDialog::loadGroupSummary(const std::list<RsGxsGenericGroupData*>& groupInfo)
{ {
#ifdef DEBUG_GROUPFRAMEDIALOG #ifdef DEBUG_GROUPFRAMEDIALOG
std::cerr << "GxsGroupFrameDialog::loadGroupSummary()"; std::cerr << "GxsGroupFrameDialog::loadGroupSummary()";
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
std::list<RsGroupMetaData> groupInfo;
RsUserdata *userdata = NULL;
loadGroupSummaryToken(token, groupInfo, userdata);
mCachedGroupMetas.clear();
for(auto it(groupInfo.begin());it!=groupInfo.end();++it)
mCachedGroupMetas[(*it).mGroupId] = *it;
insertGroupsData(mCachedGroupMetas, userdata);
updateSearchResults();
mStateHelper->setLoading(TOKEN_TYPE_GROUP_SUMMARY, false);
if (userdata) {
delete(userdata);
}
if (!mNavigatePendingGroupId.isNull()) {
/* Navigate pending */
navigate(mNavigatePendingGroupId, mNavigatePendingMsgId);
mNavigatePendingGroupId.clear();
mNavigatePendingMsgId.clear();
}
} }
/*********************** **** **** **** ***********************/ /*********************** **** **** **** ***********************/
@ -1145,6 +1149,7 @@ void GxsGroupFrameDialog::loadGroupSummary(const uint32_t &token)
// setValid(true); // setValid(true);
//} //}
#endif
/*********************** **** **** **** ***********************/ /*********************** **** **** **** ***********************/
/*********************** **** **** **** ***********************/ /*********************** **** **** **** ***********************/
@ -1186,9 +1191,9 @@ void GxsGroupFrameDialog::loadRequest(const TokenQueue *queue, const TokenReques
/* now switch on req */ /* now switch on req */
switch(req.mUserType) switch(req.mUserType)
{ {
case TOKEN_TYPE_GROUP_SUMMARY: // case TOKEN_TYPE_GROUP_SUMMARY:
loadGroupSummary(req.mToken); // loadGroupSummary(req.mToken);
break; // break;
// case TOKEN_TYPE_SUBSCRIBE_CHANGE: // case TOKEN_TYPE_SUBSCRIBE_CHANGE:
// acknowledgeSubscribeChange(req.mToken); // acknowledgeSubscribeChange(req.mToken);

13
retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.h
View File

@ -93,12 +93,14 @@ protected:
bool getCurrentGroupName(QString& name); bool getCurrentGroupName(QString& name);
virtual RetroShareLink::enumType getLinkType() = 0; virtual RetroShareLink::enumType getLinkType() = 0;
virtual GroupFrameSettings::Type groupFrameSettingsType() { return GroupFrameSettings::Nothing; } virtual GroupFrameSettings::Type groupFrameSettingsType() { return GroupFrameSettings::Nothing; }
virtual void groupInfoToGroupItemInfo(const RsGroupMetaData &groupInfo, GroupItemInfo &groupItemInfo, const RsUserdata *userdata); virtual void groupInfoToGroupItemInfo(const RsGxsGenericGroupData *groupInfo, GroupItemInfo &groupItemInfo);
virtual void checkRequestGroup(const RsGxsGroupId& /* grpId */) {} // overload this one in order to retrieve full group data when the group is browsed virtual void checkRequestGroup(const RsGxsGroupId& /* grpId */) {} // overload this one in order to retrieve full group data when the group is browsed
void updateMessageSummaryList(RsGxsGroupId groupId); void updateMessageSummaryList(RsGxsGroupId groupId);
virtual const std::set<TurtleRequestId> getSearchRequests() const { return std::set<TurtleRequestId>(); } // overload this for subclasses that provide distant search virtual const std::set<TurtleRequestId> getSearchRequests() const { return std::set<TurtleRequestId>(); } // overload this for subclasses that provide distant search
virtual bool getGroupData(std::list<RsGxsGenericGroupData*>& groupInfo) =0;
private slots: private slots:
void todo(); void todo();
@ -162,12 +164,13 @@ private:
void processSettings(bool load); void processSettings(bool load);
// New Request/Response Loading Functions. // New Request/Response Loading Functions.
void insertGroupsData(const std::map<RsGxsGroupId, RsGroupMetaData> &groupList, const RsUserdata *userdata); void insertGroupsData(const std::list<RsGxsGenericGroupData *> &groupList);
//void requestGroupSummary();
void updateGroupSummary();
void loadGroupSummary(const std::list<RsGxsGenericGroupData *> &groupInfo);
void requestGroupSummary();
void loadGroupSummary(const uint32_t &token);
virtual uint32_t requestGroupSummaryType() { return GXS_REQUEST_TYPE_GROUP_META; } // request only meta data virtual uint32_t requestGroupSummaryType() { return GXS_REQUEST_TYPE_GROUP_META; } // request only meta data
virtual void loadGroupSummaryToken(const uint32_t &token, std::list<RsGroupMetaData> &groupInfo, RsUserdata* &userdata); // use with requestGroupSummaryType
void requestGroupStatistics(const RsGxsGroupId &groupId); void requestGroupStatistics(const RsGxsGroupId &groupId);
void loadGroupStatistics(const uint32_t &token); void loadGroupStatistics(const uint32_t &token);

72
retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
View File

@ -36,15 +36,15 @@
#include "gui/common/GroupTreeWidget.h" #include "gui/common/GroupTreeWidget.h"
#include "util/qtthreadsutils.h" #include "util/qtthreadsutils.h"
class GxsChannelGroupInfoData : public RsUserdata // class GxsChannelGroupInfoData : public RsUserdata
{ // {
public: // public:
GxsChannelGroupInfoData() : RsUserdata() {} // GxsChannelGroupInfoData() : RsUserdata() {}
//
public: // public:
QMap<RsGxsGroupId, QIcon> mIcon; // QMap<RsGxsGroupId, QIcon> mIcon;
QMap<RsGxsGroupId, QString> mDescription; // QMap<RsGxsGroupId, QString> mDescription;
}; // };
/** Constructor */ /** Constructor */
GxsChannelDialog::GxsChannelDialog(QWidget *parent) GxsChannelDialog::GxsChannelDialog(QWidget *parent)
@ -344,6 +344,34 @@ void GxsChannelDialog::toggleAutoDownload()
}); });
} }
bool GxsChannelDialog::getGroupData(std::list<RsGxsGenericGroupData*>& groupInfo)
{
std::vector<RsGxsChannelGroup> groups;
// request all group infos at once
if(! rsGxsChannels->getChannelsInfo(std::list<RsGxsGroupId>(),groups))
return false;
/* Save groups to fill icons and description */
for (auto& group: groups)
groupInfo.push_back(new RsGxsChannelGroup(group));
// if (group.mImage.mData != NULL) {
// QPixmap image;
// GxsIdDetails::loadPixmapFromData(group.mImage.mData, group.mImage.mSize, image,GxsIdDetails::ORIGINAL);
// channelData->mIcon[group.mMeta.mGroupId] = image;
// }
//
// if (!group.mDescription.empty()) {
// channelData->mDescription[group.mMeta.mGroupId] = QString::fromUtf8(group.mDescription.c_str());
// }
return true;
}
#ifdef TO_REMOVE
void GxsChannelDialog::loadGroupSummaryToken(const uint32_t &token, std::list<RsGroupMetaData> &groupInfo, RsUserdata *&userdata) void GxsChannelDialog::loadGroupSummaryToken(const uint32_t &token, std::list<RsGroupMetaData> &groupInfo, RsUserdata *&userdata)
{ {
std::vector<RsGxsChannelGroup> groups; std::vector<RsGxsChannelGroup> groups;
@ -369,27 +397,25 @@ void GxsChannelDialog::loadGroupSummaryToken(const uint32_t &token, std::list<Rs
} }
} }
} }
#endif
void GxsChannelDialog::groupInfoToGroupItemInfo(const RsGroupMetaData &groupInfo, GroupItemInfo &groupItemInfo, const RsUserdata *userdata) void GxsChannelDialog::groupInfoToGroupItemInfo(const RsGxsGenericGroupData *groupData, GroupItemInfo &groupItemInfo)
{ {
GxsGroupFrameDialog::groupInfoToGroupItemInfo(groupInfo, groupItemInfo, userdata); GxsGroupFrameDialog::groupInfoToGroupItemInfo(groupData, groupItemInfo);
const GxsChannelGroupInfoData *channelData = dynamic_cast<const GxsChannelGroupInfoData*>(userdata); const RsGxsChannelGroup *channelGroupData = dynamic_cast<const RsGxsChannelGroup*>(groupData);
if (!channelData) {
std::cerr << "GxsChannelDialog::groupInfoToGroupItemInfo() Failed to cast data to GxsChannelGroupInfoData"; if (!channelGroupData)
std::cerr << std::endl; {
std::cerr << "GxsChannelDialog::groupInfoToGroupItemInfo() Failed to cast data to GxsChannelGroupInfoData"<< std::endl;
return; return;
} }
QMap<RsGxsGroupId, QString>::const_iterator descriptionIt = channelData->mDescription.find(groupInfo.mGroupId); QPixmap image;
if (descriptionIt != channelData->mDescription.end()) { GxsIdDetails::loadPixmapFromData(channelGroupData->mImage.mData, channelGroupData->mImage.mSize, image,GxsIdDetails::ORIGINAL);
groupItemInfo.description = descriptionIt.value();
}
QMap<RsGxsGroupId, QIcon>::const_iterator iconIt = channelData->mIcon.find(groupInfo.mGroupId); groupItemInfo.description = QString::fromUtf8(channelGroupData->mDescription.c_str());
if (iconIt != channelData->mIcon.end()) { groupItemInfo.icon = image;
groupItemInfo.icon = iconIt.value();
}
} }
TurtleRequestId GxsChannelDialog::distantSearch(const QString& search_string) TurtleRequestId GxsChannelDialog::distantSearch(const QString& search_string)

5
retroshare-gui/src/gui/gxschannels/GxsChannelDialog.h
View File

@ -46,7 +46,7 @@ protected:
virtual RetroShareLink::enumType getLinkType() { return RetroShareLink::TYPE_CHANNEL; } virtual RetroShareLink::enumType getLinkType() { return RetroShareLink::TYPE_CHANNEL; }
virtual GroupFrameSettings::Type groupFrameSettingsType() { return GroupFrameSettings::Channel; } virtual GroupFrameSettings::Type groupFrameSettingsType() { return GroupFrameSettings::Channel; }
virtual QString getHelpString() const ; virtual QString getHelpString() const ;
virtual void groupInfoToGroupItemInfo(const RsGroupMetaData &groupInfo, GroupItemInfo &groupItemInfo, const RsUserdata *userdata); virtual void groupInfoToGroupItemInfo(const RsGxsGenericGroupData *groupData, GroupItemInfo &groupItemInfo);
virtual bool getDistantSearchResults(TurtleRequestId id, std::map<RsGxsGroupId,RsGxsGroupSummary>& group_infos); virtual bool getDistantSearchResults(TurtleRequestId id, std::map<RsGxsGroupId,RsGxsGroupSummary>& group_infos);
virtual const std::set<TurtleRequestId> getSearchRequests() const override { return mSearchResults ; } virtual const std::set<TurtleRequestId> getSearchRequests() const override { return mSearchResults ; }
@ -73,7 +73,8 @@ private:
virtual RsGxsCommentService *getCommentService(); virtual RsGxsCommentService *getCommentService();
virtual QWidget *createCommentHeaderWidget(const RsGxsGroupId &grpId, const RsGxsMessageId &msgId); virtual QWidget *createCommentHeaderWidget(const RsGxsGroupId &grpId, const RsGxsMessageId &msgId);
virtual uint32_t requestGroupSummaryType() { return GXS_REQUEST_TYPE_GROUP_DATA; } // request complete group data virtual uint32_t requestGroupSummaryType() { return GXS_REQUEST_TYPE_GROUP_DATA; } // request complete group data
virtual void loadGroupSummaryToken(const uint32_t &token, std::list<RsGroupMetaData> &groupInfo, RsUserdata* &userdata);
bool getGroupData(std::list<RsGxsGenericGroupData*>& groupInfo) override;
void handleEvent_main_thread(std::shared_ptr<const RsEvent> event); void handleEvent_main_thread(std::shared_ptr<const RsEvent> event);

34
retroshare-gui/src/gui/gxsforums/GxsForumsDialog.cpp
View File

@ -80,6 +80,18 @@ GxsForumsDialog::~GxsForumsDialog()
rsEvents->unregisterEventsHandler(mEventHandlerId); rsEvents->unregisterEventsHandler(mEventHandlerId);
} }
bool GxsForumsDialog::getGroupData(std::list<RsGxsGenericGroupData*>& groupInfo)
{
std::vector<RsGxsForumGroup> groups;
if(! rsGxsForums->getForumsInfo(std::list<RsGxsGroupId>(),groups))
return false;
for (auto& group: groups)
groupInfo.push_back(new RsGxsForumGroup(group));
}
QString GxsForumsDialog::getHelpString() const QString GxsForumsDialog::getHelpString() const
{ {
QString hlp_str = tr( QString hlp_str = tr(
@ -207,7 +219,26 @@ void GxsForumsDialog::loadGroupSummaryToken(const uint32_t &token, std::list<RsG
} }
} }
void GxsForumsDialog::groupInfoToGroupItemInfo(const RsGroupMetaData &groupInfo, GroupItemInfo &groupItemInfo, const RsUserdata *userdata) void GxsForumsDialog::groupInfoToGroupItemInfo(const RsGxsGenericGroupData *groupData, GroupItemInfo &groupItemInfo)
{
GxsGroupFrameDialog::groupInfoToGroupItemInfo(groupData, groupItemInfo);
const RsGxsForumGroup *forumGroupData = dynamic_cast<const RsGxsForumGroup*>(groupData);
if (!forumGroupData)
{
std::cerr << "GxsChannelDialog::groupInfoToGroupItemInfo() Failed to cast data to GxsChannelGroupInfoData"<< std::endl;
return;
}
groupItemInfo.description = QString::fromUtf8(forumGroupData->mDescription.c_str());
if ((IS_GROUP_PGP_AUTHED(groupData->mMeta.mSignFlags)) || (IS_GROUP_MESSAGE_TRACKING(groupData->mMeta.mSignFlags)) )
groupItemInfo.icon = QIcon(":icons/png/forums-signed.png");
}
#ifdef TO_REMOVE
void ::groupInfoToGroupItemInfo(const RsGroupMetaData &groupInfo, GroupItemInfo &groupItemInfo, const RsUserdata *userdata)
{ {
GxsGroupFrameDialog::groupInfoToGroupItemInfo(groupInfo, groupItemInfo, userdata); GxsGroupFrameDialog::groupInfoToGroupItemInfo(groupInfo, groupItemInfo, userdata);
@ -229,3 +260,4 @@ void GxsForumsDialog::groupInfoToGroupItemInfo(const RsGroupMetaData &groupInfo,
groupItemInfo.icon = QIcon(":icons/png/forums-signed.png"); groupItemInfo.icon = QIcon(":icons/png/forums-signed.png");
} }
#endif

4
retroshare-gui/src/gui/gxsforums/GxsForumsDialog.h
View File

@ -45,7 +45,9 @@ protected:
virtual QString getHelpString() const ; virtual QString getHelpString() const ;
virtual RetroShareLink::enumType getLinkType() { return RetroShareLink::TYPE_FORUM; } virtual RetroShareLink::enumType getLinkType() { return RetroShareLink::TYPE_FORUM; }
virtual GroupFrameSettings::Type groupFrameSettingsType() { return GroupFrameSettings::Forum; } virtual GroupFrameSettings::Type groupFrameSettingsType() { return GroupFrameSettings::Forum; }
virtual void groupInfoToGroupItemInfo(const RsGroupMetaData &groupInfo, GroupItemInfo &groupItemInfo, const RsUserdata *userdata);
void groupInfoToGroupItemInfo(const RsGxsGenericGroupData *groupData, GroupItemInfo &groupItemInfo) override;
bool getGroupData(std::list<RsGxsGenericGroupData*>& groupInfo) override;
private: private:
/* GxsGroupFrameDialog */ /* GxsGroupFrameDialog */