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

Bugfixes for correct Channels display.

Browse Source 
* Corrected search in ftserver.
 * Updated avail in controller FileDetails.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@858 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-11-30 17:17:28 +00:00
parent 0c4947f4e6
commit 9f727e2d94
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/ft/ftcontroller.cc
View File

@ -926,10 +926,12 @@ bool ftController::FileDetails(std::string hash, FileInfo &info)
if (completed)
{
info.transfered = info.size;
info.avail = info.transfered;
}
else
{
info.transfered = (it->second).mCreator->getRecvd();
info.avail = info.transfered;
}
return true;

8
libretroshare/src/ft/ftserver.cc
View File

@ -246,7 +246,9 @@ std::string ftServer::getPartialsDirectory()
bool ftServer::FileDownloads(std::list<std::string> &hashs)
{
return mFtDataplex->FileDownloads(hashs);
return mFtController->FileDownloads(hashs);
/* this only contains downloads.... not completed */
//return mFtDataplex->FileDownloads(hashs);
}
bool ftServer::FileUploads(std::list<std::string> &hashs)
@ -257,14 +259,14 @@ bool ftServer::FileUploads(std::list<std::string> &hashs)
bool ftServer::FileDetails(std::string hash, uint32_t hintflags, FileInfo &info)
{
bool found = false;
if (hintflags | RS_FILE_HINTS_DOWNLOAD)
if (hintflags & RS_FILE_HINTS_DOWNLOAD)
{
//found = mFtDataplex->FileDetails(hash, hintflags, info);
//
// Use Controller for download searches.
found = mFtController->FileDetails(hash, info);
}
else if (hintflags | RS_FILE_HINTS_UPLOAD)
else if (hintflags & RS_FILE_HINTS_UPLOAD)
{
found = mFtDataplex->FileDetails(hash, hintflags, info);
}