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

ported branch commits 2666-2668, 2670-2672, 2679, 2682-2683 into trunk

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2702 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-04-10 14:56:34 +00:00
parent 063a366d12
commit c6c8e63e91
12 changed files with 153 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libretroshare/src/dbase/fimonitor.cc
View file

@ -297,6 +297,8 @@ void FileIndexMonitor::updateCycle()
mInCheck = true;
}
cb->notifyHashingInfo("Examining shared files...") ;
std::vector<DirContentToHash> to_hash ;
while(moretodo)
@ -514,6 +516,8 @@ void FileIndexMonitor::updateCycle()
if(!to_hash.empty())
hashFiles(to_hash) ;
cb->notifyHashingInfo("") ;
{ /* LOCKED DIRS */
RsStackMutex stack(fiMutex); /**** LOCKED DIRS ****/
@ -579,7 +583,7 @@ void FileIndexMonitor::hashFiles(const std::vector<DirContentToHash>& to_hash)
std::ostringstream tmpout;
tmpout << cnt+1 << "/" << n_files << " (" << int(size/double(total_size)*100.0) << "%) : " << to_hash[i].fentries[j].name ;
cb->notifyHashingInfo(tmpout.str()) ;
cb->notifyHashingInfo("Hashing file " + tmpout.str()) ;
FileEntry fe(to_hash[i].fentries[j]) ; // copied, because hashFile updates the hash member
@ -609,7 +613,6 @@ void FileIndexMonitor::hashFiles(const std::vector<DirContentToHash>& to_hash)
}
cb->notifyHashingInfo("") ;
cb->notifyListChange(NOTIFY_LIST_DIRLIST_LOCAL, 0);
}