Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-07 06:02:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Share Flags

Browse source 
- now only the directories with flag "browsable" on are dispatched to friends
  - when switching flags, directories are re-sent to friends

Still to do:
  - turtle search only files with "Network wide" flag on
  - test what happens when 2 directories have the same base name
  - display own directories by calling FileIndexMonitor instead of FileIndexStore

Warning: at this time, directories that are not browsable do not appear in the Files dialog under "my directories".



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1506 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2009-08-09 16:32:31 +00:00
parent 6928b3c426
commit 4157321000
6 changed files with 168 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

49
libretroshare/src/dbase/findex.cc
View file

@ -859,7 +859,7 @@ error:
}
int FileIndex::saveIndex(std::string filename, std::string &fileHash, uint64_t &size)
int FileIndex::saveIndex(std::string filename, std::string &fileHash, uint64_t &size,const std::set<std::string>& forbidden_dirs)
{
unsigned char sha_buf[SHA_DIGEST_LENGTH];
std::ofstream file (filename.c_str(), std::ofstream::binary);
@ -881,7 +881,25 @@ int FileIndex::saveIndex(std::string filename, std::string &fileHash, uint64_t &
oss << "#" << std::endl;
/* begin recusion */
root->saveEntry(oss);
root->writeDirInfo(oss) ;
std::map<std::string, DirEntry *>::iterator it;
for(it = root->subdirs.begin(); it != root->subdirs.end(); it++)
{
std::cout << "writting root directory: name=" << it->second->name << ", path=" << it->second->path << std::endl ;
if(forbidden_dirs.find(it->second->name) != forbidden_dirs.end())
std::cerr << " will be suppressed." << std::endl ;
else
{
std::cerr << " will be saved." << std::endl ;
(it->second)->saveEntry(oss);
}
}
root->writeFileInfo(oss) ; // this should never do anything
/* signal to pop directory from stack in loadIndex() */
oss << "-" << std::endl;
/* calculate sha1 hash */
SHA_CTX *sha_ctx = new SHA_CTX;
@ -920,9 +938,7 @@ std::string FixName(std::string in)
return in;
}
/* recusive function for traversing the dir tree in preorder */
int DirEntry::saveEntry(std::ostringstream &oss)
void DirEntry::writeDirInfo(std::ostringstream& oss)
{
/* print node info */
oss << "d";
@ -932,13 +948,10 @@ int DirEntry::saveEntry(std::ostringstream &oss)
oss << modtime << ",";
oss << pop << ",";
oss << updtime << "," << std::endl;
}
std::map<std::string, DirEntry *>::iterator it;
for(it = subdirs.begin(); it != subdirs.end(); it++)
{
(it->second)->saveEntry(oss);
}
void DirEntry::writeFileInfo(std::ostringstream& oss)
{
/* print file info */
std::map<std::string, FileEntry *>::iterator fit;
for(fit = files.begin(); fit != files.end(); fit++)
@ -951,6 +964,20 @@ int DirEntry::saveEntry(std::ostringstream &oss)
oss << (fit->second)->pop << ",";
oss << (fit->second)->updtime << "," << std::endl;
}
}
/* recusive function for traversing the dir tree in preorder */
int DirEntry::saveEntry(std::ostringstream &oss)
{
writeDirInfo(oss) ;
std::map<std::string, DirEntry *>::iterator it;
for(it = subdirs.begin(); it != subdirs.end(); it++)
{
(it->second)->saveEntry(oss);
}
writeFileInfo(oss) ;
/* signal to pop directory from stack in loadIndex() */
oss << "-" << std::endl;