Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-31 17:53:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

add code for cancen file transfer

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@854 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
ewensun 2008-11-29 22:03:36 +00:00
parent 77cb7314bc
commit 00a0fdfbbf
2 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -279,7 +279,7 @@ bool ftController::completeFile(std::string hash)
if (doCallback) if (doCallback)
{ {
#ifdef CONTROL_DEBUG #ifdef CONTROL_DEBUG
std::cerr << "ftController::completeFile() doing Callback"; std::cerr << "ftController::completeFile() doing Callback, callbackCode:" << callbackCode;
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
switch (callbackCode) switch (callbackCode)
@ -663,9 +663,44 @@ bool ftController::FileCancel(std::string hash)
return false; return false;
} }
/* check if finished */
if ((mit->second).mCreator->finished())
{
#ifdef CONTROL_DEBUG
std::cerr << "ftController:FileCancel(" << hash << ")";
std::cerr << " Transfer Already finished";
std::cerr << std::endl;
std::cerr << "FileSize: ";
std::cerr << (mit->second).mCreator->getFileSize();
std::cerr << " and Recvd: ";
std::cerr << (mit->second).mCreator->getRecvd();
#endif
return false;
}
/*find the point to transfer module*/ /*find the point to transfer module*/
ftTransferModule* ft=(mit->second).mTransfer; ftTransferModule* ft=(mit->second).mTransfer;
ft->cancelTransfer(); ft->cancelTransfer();
ftFileControl *fc = &(mit->second);
mDataplex->removeTransferModule(fc->mTransfer->hash());
if (fc->mTransfer)
{
delete fc->mTransfer;
fc->mTransfer = NULL;
}
if (fc->mCreator)
{
delete fc->mCreator;
fc->mCreator = NULL;
}
fc->mState = ftFileControl::ERROR_COMPLETION;
mDownloads.erase(mit);
return true; return true;
} }

14
libretroshare/src/ft/fttransfermodule.cc
View File

@ -23,9 +23,7 @@
* *
*/ */
/******* #define FT_DEBUG 1
* #define FT_DEBUG 1
******/
#include "fttransfermodule.h" #include "fttransfermodule.h"
@ -411,9 +409,10 @@ bool ftTransferModule::cancelTransfer()
bool ftTransferModule::completeFileTransfer() bool ftTransferModule::completeFileTransfer()
{ {
#ifdef FT_DEBUG
std::cerr << "ftTransferModule::completeFileTransfer()"; std::cerr << "ftTransferModule::completeFileTransfer()";
std::cerr << std::endl; std::cerr << std::endl;
#endif
if (mFtController) if (mFtController)
mFtController->FlagFileComplete(mHash); mFtController->FlagFileComplete(mHash);
return true; return true;
@ -454,14 +453,13 @@ int ftTransferModule::tick()
switch (flags) switch (flags)
{ {
case 0: case 0: //file transfer not complete
adjustSpeed(); adjustSpeed();
break; break;
case 1: case 1: //file transfer complete
completeFileTransfer(); completeFileTransfer();
break; break;
case 2: case 2: //file transfer canceled
/* tell me what to do here */
break; break;
default: default:
break; break;