diff options
Diffstat (limited to 'src/CreateRequestCommand.cc')
| -rw-r--r-- | src/CreateRequestCommand.cc | 65 |
1 files changed, 33 insertions, 32 deletions
diff --git a/src/CreateRequestCommand.cc b/src/CreateRequestCommand.cc index b7b178a7..2b4bf513 100644 --- a/src/CreateRequestCommand.cc +++ b/src/CreateRequestCommand.cc @@ -54,12 +54,11 @@ namespace aria2 { CreateRequestCommand::CreateRequestCommand(cuid_t cuid, RequestGroup* requestGroup, - DownloadEngine* e): - AbstractCommand - (cuid, std::shared_ptr<Request>(), std::shared_ptr<FileEntry>(), requestGroup, e, - std::shared_ptr<SocketCore>(), - std::shared_ptr<SocketRecvBuffer>(), - false) + DownloadEngine* e) + : AbstractCommand(cuid, std::shared_ptr<Request>(), + std::shared_ptr<FileEntry>(), requestGroup, e, + std::shared_ptr<SocketCore>(), + std::shared_ptr<SocketRecvBuffer>(), false) { setStatus(Command::STATUS_ONESHOT_REALTIME); disableReadCheckSocket(); @@ -68,34 +67,35 @@ CreateRequestCommand::CreateRequestCommand(cuid_t cuid, bool CreateRequestCommand::executeInternal() { - if(getSegments().empty()) { + if (getSegments().empty()) { setFileEntry(getDownloadContext()->findFileEntryByOffset(0)); - } else { + } + else { // We assume all segments belongs to same file. - setFileEntry(getDownloadContext()->findFileEntryByOffset - (getSegments().front()->getPositionToWrite())); + setFileEntry(getDownloadContext()->findFileEntryByOffset( + getSegments().front()->getPositionToWrite())); } - std::vector<std::pair<size_t, std::string> > usedHosts; - if(getOption()->getAsBool(PREF_SELECT_LEAST_USED_HOST)) { + std::vector<std::pair<size_t, std::string>> usedHosts; + if (getOption()->getAsBool(PREF_SELECT_LEAST_USED_HOST)) { getDownloadEngine()->getRequestGroupMan()->getUsedHosts(usedHosts); } - setRequest - (getFileEntry()->getRequest(getRequestGroup()->getURISelector().get(), - getOption()->getAsBool(PREF_REUSE_URI), - usedHosts, - getOption()->get(PREF_REFERER), - // Don't use HEAD request when file - // size is known. - // Use HEAD for dry-run mode. - (getFileEntry()->getLength() == 0 && - getOption()->getAsBool(PREF_USE_HEAD)) || - getOption()->getAsBool(PREF_DRY_RUN)? - Request::METHOD_HEAD:Request::METHOD_GET)); - if(!getRequest()) { - if(getSegmentMan()) { + setRequest( + getFileEntry()->getRequest(getRequestGroup()->getURISelector().get(), + getOption()->getAsBool(PREF_REUSE_URI), + usedHosts, getOption()->get(PREF_REFERER), + // Don't use HEAD request when file + // size is known. + // Use HEAD for dry-run mode. + (getFileEntry()->getLength() == 0 && + getOption()->getAsBool(PREF_USE_HEAD)) || + getOption()->getAsBool(PREF_DRY_RUN) + ? Request::METHOD_HEAD + : Request::METHOD_GET)); + if (!getRequest()) { + if (getSegmentMan()) { getSegmentMan()->ignoreSegmentFor(getFileEntry()); } - if(getOption()->getAsBool(PREF_DRY_RUN)) { + if (getOption()->getAsBool(PREF_DRY_RUN)) { // For dry run mode, just throwing DlAbortEx makes infinite // loop, since we don't have SegmentMan, and we cannot tell all // hopes were abandoned. @@ -106,7 +106,8 @@ bool CreateRequestCommand::executeInternal() // so use it here. throw DL_ABORT_EX2("No URI available.", getRequestGroup()->getLastErrorCode()); - } else if(getRequest()->getWakeTime() > global::wallclock()) { + } + else if (getRequest()->getWakeTime() > global::wallclock()) { A2_LOG_DEBUG("This request object is still sleeping."); getFileEntry()->poolRequest(getRequest()); // Reset request of this command. Without this, request is doubly @@ -118,10 +119,10 @@ bool CreateRequestCommand::executeInternal() } getDownloadEngine()->setNoWait(true); - getDownloadEngine()->addCommand - (InitiateConnectionCommandFactory::createInitiateConnectionCommand - (getCuid(), getRequest(), getFileEntry(), getRequestGroup(), - getDownloadEngine())); + getDownloadEngine()->addCommand( + InitiateConnectionCommandFactory::createInitiateConnectionCommand( + getCuid(), getRequest(), getFileEntry(), getRequestGroup(), + getDownloadEngine())); return true; } |
