Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-19 22:40:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Addition of new File Transfer structure. (server / search / extralist / controller)

Browse source 
* 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:
drbob 2008-07-02 13:19:59 +00:00
parent eeb13e7b18
commit 473f3f75f3
16 changed files with 1337 additions and 419 deletions
Download patch file Download diff file Expand all files Collapse all files

186
libretroshare/src/rsserver/rstypes.cc
View file

@ -45,189 +45,3 @@
*
**********************************************************************/
/****************************************/
/* Print Functions for Info Classes */
std::ostream &operator<<(std::ostream &out, const PersonInfo &info)
{
out << "Directory Listing for: " << info.name;
out << std::endl;
print(out, info.rootdir, 0);
return out;
}
std::ostream &print(std::ostream &out, const DirInfo &info, int indentLvl)
{
int i;
std::ostringstream indents;
for(i = 0; i < indentLvl; i++)
{
indents << " ";
}
out << indents.str() << "Dir: " << info.dirname << std::endl;
if (info.subdirs.size() > 0)
{
out << indents.str() << "subdirs:" << std::endl;
std::list<DirInfo>::const_iterator it;
for(it = info.subdirs.begin(); it != info.subdirs.end(); it++)
{
print(out, *it, indentLvl + 1);
}
}
if (info.files.size() > 0)
{
out << indents.str() << "files:" << std::endl;
std::list<FileInfo>::const_iterator it2;
for(it2 = info.files.begin(); it2 != info.files.end(); it2++)
{
out << indents.str() << " " << it2->fname;
out << " " << it2->size << std::endl;
}
}
return out;
}
#if 0
std::ostream &operator<<(std::ostream &out, const MessageInfo &info)
{
out << "MessageInfo(TODO)";
out << std::endl;
return out;
}
std::ostream &operator<<(std::ostream &out, const ChatInfo &info)
{
out << "ChatInfo(TODO)";
out << std::endl;
return out;
}
#endif
int DirInfo::merge(const DirInfo &udir)
{
/* add in the data from the udir */
if (infoAge > udir.infoAge)
{
return -1;
}
std::list<DirInfo>::const_iterator it;
for(it = udir.subdirs.begin(); it != udir.subdirs.end(); it++)
{
update(*it);
}
std::list<FileInfo>::const_iterator it2;
for(it2 = udir.files.begin(); it2 != udir.files.end(); it2++)
{
add(*it2);
}
infoAge = udir.infoAge;
nobytes = udir.nobytes;
//nofiles = udir.nofiles;
nofiles = subdirs.size() + files.size();
return 1;
}
int DirInfo::update(const DirInfo &dir)
{
/* add in the data from the udir */
DirInfo *odir = existsPv(dir);
if (odir)
{
// leave.. dirup -> subdirs = pd.data.subdirs;
// leave.. dirup -> files = pd.data.files;
odir->infoAge = dir.infoAge;
odir->nofiles = dir.nofiles;
odir->nobytes = dir.nobytes;
}
else
{
subdirs.push_back(dir);
}
return 1;
}
bool DirInfo::exists(const DirInfo &sdir)
{
return (existsPv(sdir) != NULL);
}
DirInfo *DirInfo::existsPv(const DirInfo &sdir)
{
std::list<DirInfo>::iterator it;
for(it = subdirs.begin(); it != subdirs.end(); it++)
{
if (sdir.dirname == it->dirname)
{
return &(*it);
}
}
return NULL;
}
bool DirInfo::exists(const FileInfo &file)
{
return (existsPv(file) != NULL);
}
FileInfo *DirInfo::existsPv(const FileInfo &file)
{
std::list<FileInfo>::iterator it;
for(it = files.begin(); it != files.end(); it++)
{
if (file.fname == it->fname)
{
return &(*it);
}
}
return NULL;
}
bool DirInfo::add(const DirInfo & sdir)
{
DirInfo *entry = existsPv(sdir);
if (entry)
{
*entry = sdir;
return false;
}
else
{
subdirs.push_back(sdir);
return true;
}
}
bool DirInfo::add(const FileInfo & file)
{
FileInfo *entry = existsPv(file);
if (entry)
{
*entry = file;
return false;
}
else
{
files.push_back(file);
return true;
}
}