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

added choice for default auto-download directory per channel.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6376 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-05-23 21:47:50 +00:00
parent 2986e81f7e
commit c2fa746991
7 changed files with 280 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

49
libretroshare/src/services/p3channels.cc
View file

@ -117,6 +117,7 @@ bool p3Channels::getChannelInfo(const std::string &cId, ChannelInfo &ci)
ci.pop = gi->sources.size();
ci.lastPost = gi->lastPost;
ci.destination_directory = (mDestinationDirectories.find(cId)==mDestinationDirectories.end())?"":(mDestinationDirectories[cId]) ;
ci.pngChanImage = gi->grpIcon.pngImageData;
@ -666,6 +667,16 @@ void p3Channels::getPubKeysAvailableGrpIds(std::list<std::string>& grpIds)
}
bool p3Channels::channelSetDestinationDirectory(const std::string& chId, const std::string& dest_dir)
{
RsStackMutex stack(distribMtx);
mDestinationDirectories[chId] = dest_dir ;
IndicateConfigChanged() ;
return true ;
}
bool p3Channels::channelSetAutoDl(const std::string& chId, bool autoDl)
{
@ -988,18 +999,28 @@ void p3Channels::locked_notifyGroupChanged(GroupInfo &grp, uint32_t flags, bool
bool p3Channels::childLoadList(std::list<RsItem* >& configSaves)
{
RsChannelReadStatus* drs = NULL;
std::list<RsItem* >::iterator it;
RsChannelDestDirConfigItem *dd = NULL ;
for(it = configSaves.begin(); it != configSaves.end(); it++)
for(std::list<RsItem* >::iterator it = configSaves.begin(); it != configSaves.end(); it++)
{
if(NULL != (drs = dynamic_cast<RsChannelReadStatus* >(*it)))
processChanReadStatus(drs); // don't delete, since it's used later on.
else if(NULL != (dd = dynamic_cast<RsChannelDestDirConfigItem*>(*it)))
{
processChanReadStatus(drs);
mDestinationDirectories.clear() ;
for(uint32_t i=0;i<dd->dest_dirs.size();++i)
{
mDestinationDirectories[dd->dest_dirs[i].first] = dd->dest_dirs[i].second ;
std::cerr << "p3Channels: setDestination directory or ChId " << dd->dest_dirs[i].first << " to " << dd->dest_dirs[i].second <<std::endl;
}
delete *it ;
}
else
{
std::cerr << "p3Channels::childLoadList(): Configs items loaded were incorrect!"
<< std::endl;
std::cerr << "p3Channels::childLoadList(): Configs items loaded were incorrect!" << std::endl;
if(*it != NULL)
delete *it;
@ -1011,9 +1032,8 @@ bool p3Channels::childLoadList(std::list<RsItem* >& configSaves)
void p3Channels::processChanReadStatus(RsChannelReadStatus* drs)
{
// mReadStatus.push_back(drs);
mReadStatus.push_back(drs);
std::string chId = drs->channelId;
statMap::iterator sit = drs->msgReadStatus.find(chId);
@ -1030,13 +1050,10 @@ void p3Channels::processChanReadStatus(RsChannelReadStatus* drs)
mReadStatus.push_back(drs);
saveList.push_back(drs);
}
std::list<RsItem *> p3Channels::childSaveList()
{
std::list<RsChannelReadStatus* >::iterator lit = mReadStatus.begin();
statMap::iterator sit, mit;
@ -1057,7 +1074,17 @@ std::list<RsItem *> p3Channels::childSaveList()
}
}
return saveList;
// Make a copy of saveList and add additional items we want to save.
//
std::list<RsItem*> to_return = saveList ;
RsChannelDestDirConfigItem *dd = new RsChannelDestDirConfigItem ;
for(std::map<std::string,std::string>::const_iterator it(mDestinationDirectories.begin());it!=mDestinationDirectories.end();++it)
dd->dest_dirs.push_back(*it) ;
to_return.push_back(dd) ;
return to_return;
}
/****************************************/

2
libretroshare/src/services/p3channels.h
View file

@ -85,6 +85,7 @@ virtual bool channelEditInfo(const std::string &chId, ChannelInfo &ci);
virtual void getPubKeysAvailableGrpIds(std::list<std::string>& grpIds);
virtual bool channelSetAutoDl(const std::string& chId, bool autoDl);
virtual bool channelGetAutoDl(const std::string& chId, bool& autoDl);
virtual bool channelSetDestinationDirectory(const std::string& chId,const std::string& dest_dir) ;
/***************************************************************************************/
/****************** Event Feedback (Overloaded form p3distrib) *************************/
@ -123,6 +124,7 @@ void removeChannelReadStatusEntry(const std::string& cId);
chanStatMap mMsgReadStatus;
statMap mChannelStatus;
std::map<std::string,std::string> mDestinationDirectories ;
};