mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-10 10:05:19 -04:00
* Addition of new File Transfer structure. (server / search / extralist / controller)
* Fixed up variable names in p3Qblog.cc * Cleaned up unused BaseInfo/PersonInfo/DirInfo in rstypes/rsiface * added new rsfiles interface (rough outline at the moment) git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@628 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
eeb13e7b18
commit
473f3f75f3
16 changed files with 1337 additions and 419 deletions
|
@ -29,152 +29,6 @@
|
|||
#include "rsiface/rsiface.h"
|
||||
#include "util/rsdir.h"
|
||||
|
||||
const DirInfo *RsIface::getDirectory(std::string id, std::string path)
|
||||
{
|
||||
const DirInfo *dir = getDirectoryMod(id, path);
|
||||
return dir;
|
||||
}
|
||||
|
||||
|
||||
const PersonInfo *RsIface::getPerson(std::string id)
|
||||
{
|
||||
const PersonInfo *pi = getPersonMod(id);
|
||||
return pi;
|
||||
}
|
||||
|
||||
PersonInfo *RsIface::getPersonMod(std::string uid)
|
||||
{
|
||||
RsCertId id(uid);
|
||||
|
||||
/* get the Root of the Directories */
|
||||
std::list<PersonInfo>::iterator pit;
|
||||
|
||||
/* check if local */
|
||||
for(pit = mLocalDirList.begin();
|
||||
(pit != mLocalDirList.end()) && (pit->id != id); pit++);
|
||||
|
||||
if (pit == mLocalDirList.end())
|
||||
{
|
||||
/* check the remote ones */
|
||||
for(pit = mRemoteDirList.begin();
|
||||
(pit != mRemoteDirList.end()) && (pit->id != id); pit++);
|
||||
|
||||
/* bailout ...? */
|
||||
if (pit == mRemoteDirList.end())
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
return &(*pit);
|
||||
}
|
||||
|
||||
|
||||
DirInfo *RsIface::getDirectoryMod(std::string uid, std::string path)
|
||||
{
|
||||
RsCertId id(uid);
|
||||
|
||||
/* get the Root of the Directories */
|
||||
std::list<DirInfo>::iterator dit;
|
||||
|
||||
std::list<std::string> subdirs;
|
||||
std::list<std::string>::iterator sit;
|
||||
|
||||
PersonInfo *pi = getPersonMod(uid);
|
||||
if (!pi)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* have the correct person now */
|
||||
RsDirUtil::breakupDirList(path, subdirs);
|
||||
|
||||
DirInfo *node = &(pi -> rootdir);
|
||||
|
||||
for(sit = subdirs.begin(); sit != subdirs.end(); sit++)
|
||||
{
|
||||
for(dit = node->subdirs.begin();
|
||||
(dit != node->subdirs.end()) &&
|
||||
(dit->dirname != *sit); dit++);
|
||||
|
||||
if (dit == node->subdirs.end())
|
||||
{
|
||||
/* Directory don't exist..... */
|
||||
return NULL;
|
||||
}
|
||||
else
|
||||
{
|
||||
node = &(*dit);
|
||||
}
|
||||
}
|
||||
return node;
|
||||
}
|
||||
|
||||
|
||||
|
||||
#if 0
|
||||
|
||||
const MessageInfo *RsIface::getMessage(std::string cid_in, std::string mid_in)
|
||||
{
|
||||
/* check for this message */
|
||||
std::list<MessageInfo>::iterator it;
|
||||
|
||||
RsCertId cId(cid_in);
|
||||
RsMsgId mId(mid_in);
|
||||
|
||||
std::cerr << "RsIface::getMessage()" << std::endl;
|
||||
std::cerr << "cid: " << cid_in << " -> cId " << cId << std::endl;
|
||||
std::cerr << "mid: " << mid_in << " -> mId " << mId << std::endl;
|
||||
|
||||
for(it = mMessageList.begin(); it != mMessageList.end(); it++)
|
||||
{
|
||||
std::cerr << "VS: cid: " << it->id << std::endl;
|
||||
std::cerr << "VS: mid: " << it->msgId << std::endl;
|
||||
if ((it->id == cId) && (mId == it->msgId))
|
||||
{
|
||||
std::cerr << "MATCH!" << std::endl;
|
||||
return &(*it);
|
||||
}
|
||||
}
|
||||
|
||||
std::cerr << "NO MATCH :(" << std::endl;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
const MessageInfo *RsIface::getChannelMsg(std::string chid_in, std::string mid_in)
|
||||
{
|
||||
RsChanId cId(chid_in);
|
||||
RsMsgId mId(mid_in);
|
||||
|
||||
std::map<RsChanId, ChannelInfo>::iterator it;
|
||||
it = mChannelMap.find(cId);
|
||||
|
||||
if (it == mChannelMap.end())
|
||||
{
|
||||
it = mChannelOwnMap.find(cId);
|
||||
|
||||
if (it == mChannelOwnMap.end())
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
/* else */
|
||||
std::list<MessageInfo>::iterator it2;
|
||||
std::list<MessageInfo> &msgs = (it->second).msglist;
|
||||
for(it2 = msgs.begin(); it2 != msgs.end(); it2++)
|
||||
{
|
||||
if (mId == it2->msgId)
|
||||
{
|
||||
return &(*it2);
|
||||
}
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/* set to true */
|
||||
bool RsIface::setChanged(DataFlags set)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue