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

fixed not rehashing files that already exist in a different directory pointed by a symlink

Browse source
This commit is contained in:
csoler 2017-09-25 20:56:35 +02:00
parent 4766a8927a
commit d8cb3fe35a
2 changed files with 29 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libretroshare/src/file_sharing/hash_cache.cc
View file

@ -223,8 +223,10 @@ bool HashStorage::requestHash(const std::string& full_path,uint64_t size,time_t
#endif
RS_STACK_MUTEX(mHashMtx) ;
std::string real_path = RsDirUtil::removeSymLinks(full_path) ;
time_t now = time(NULL) ;
std::map<std::string,HashStorageInfo>::iterator it = mFiles.find(full_path) ;
std::map<std::string,HashStorageInfo>::iterator it = mFiles.find(real_path) ;
// On windows we compare the time up to +/- 3600 seconds. This avoids re-hashing files in case of daylight saving change.
//
@ -261,7 +263,7 @@ bool HashStorage::requestHash(const std::string& full_path,uint64_t size,time_t
// we need to schedule a re-hashing
if(mFilesToHash.find(full_path) != mFilesToHash.end())
if(mFilesToHash.find(real_path) != mFilesToHash.end())
return false ;
FileHashJob job ;
@ -272,7 +274,10 @@ bool HashStorage::requestHash(const std::string& full_path,uint64_t size,time_t
job.full_path = full_path ;
job.ts = mod_time ;
mFilesToHash[full_path] = job;
// We store the files indexed by their real path, so that we allow to not re-hash files that are pointed multiple times through the directory links
// The client will be notified with the full path instead of the real path.
mFilesToHash[real_path] = job;
mTotalSizeToHash += size ;
++mTotalFilesToHash;