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

added detection of flag change so that new TS is set on root of hierarchy and changes are made visible to friends at next update

Browse source
This commit is contained in:
csoler 2016-12-15 23:07:40 +01:00
parent 08294deeba
commit 8637cfa42f
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libretroshare/src/file_sharing/directory_storage.cc
View file

@ -339,6 +339,7 @@ int LocalDirectoryStorage::searchHash(const RsFileHash& hash, RsFileHash& real_h
void LocalDirectoryStorage::setSharedDirectoryList(const std::list<SharedDirInfo>& lst) void LocalDirectoryStorage::setSharedDirectoryList(const std::list<SharedDirInfo>& lst)
{ {
std::set<std::string> dirs_with_new_virtualname ; std::set<std::string> dirs_with_new_virtualname ;
bool dirs_with_changed_flags = false ;
{ {
RS_STACK_MUTEX(mDirStorageMtx) ; RS_STACK_MUTEX(mDirStorageMtx) ;
@ -374,16 +375,21 @@ void LocalDirectoryStorage::setSharedDirectoryList(const std::list<SharedDirInfo
{ {
std::map<std::string,SharedDirInfo>::iterator it2 = mLocalDirs.find(it->filename) ; std::map<std::string,SharedDirInfo>::iterator it2 = mLocalDirs.find(it->filename) ;
if(it2 != mLocalDirs.end() && it2->second.virtualname != it->virtualname) if(it2 != mLocalDirs.end())
{
if(it2->second.virtualname != it->virtualname)
dirs_with_new_virtualname.insert(it->filename) ; dirs_with_new_virtualname.insert(it->filename) ;
if(!SharedDirInfo::sameLists((*it).parent_groups,it2->second.parent_groups) || (*it).shareflags != it2->second.shareflags)
dirs_with_changed_flags = true ;
}
new_dirs[it->filename] = *it; new_dirs[it->filename] = *it;
} }
mLocalDirs = new_dirs ; mLocalDirs = new_dirs ;
}
mTSChanged = true ; mTSChanged = true ;
}
// now update the TS off-mutex. // now update the TS off-mutex.
@ -393,6 +399,9 @@ void LocalDirectoryStorage::setSharedDirectoryList(const std::list<SharedDirInfo
std::cerr << "Updating TS of local dir \"" << dirit.name() << "\" with changed virtual name" << std::endl; std::cerr << "Updating TS of local dir \"" << dirit.name() << "\" with changed virtual name" << std::endl;
setDirectoryLocalModTime(*dirit,time(NULL)); setDirectoryLocalModTime(*dirit,time(NULL));
} }
if(dirs_with_changed_flags)
setDirectoryLocalModTime(0,time(NULL)) ;
} }
void LocalDirectoryStorage::getSharedDirectoryList(std::list<SharedDirInfo>& lst) void LocalDirectoryStorage::getSharedDirectoryList(std::list<SharedDirInfo>& lst)