github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

2009-07-14 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Code cleanup
	* src/AbstractCommand.cc
	* src/DownloadCommand.cc
pull/1/head
Tatsuhiro Tsujikawa 2009-07-14 13:11:13 +00:00
parent 682bafae0a
commit 8eee188999
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2009-07-14 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Code cleanup
* src/AbstractCommand.cc
* src/DownloadCommand.cc
2009-07-13 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2009-07-13 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Use option of each download to create AuthConfig instead of global Use option of each download to create AuthConfig instead of global

2
src/AbstractCommand.cc
View File

@ -240,7 +240,7 @@ void AbstractCommand::tryReserved() {
// Don't create new command if currently file length is unknown // Don't create new command if currently file length is unknown
// and there are no URI left. Because file length is unknown, we // and there are no URI left. Because file length is unknown, we
// can assume that there are no in-flight request object. // can assume that there are no in-flight request object.
if(entry->getLength() == 0 && entry->getRemainingUris().size() == 0) { if(entry->getLength() == 0 && entry->getRemainingUris().empty()) {
return; return;
} }
} }

14
src/DownloadCommand.cc
View File

@ -169,32 +169,32 @@ bool DownloadCommand::executeInternal() {
_requestGroup->getSegmentMan()->updateDownloadSpeedFor(peerStat); _requestGroup->getSegmentMan()->updateDownloadSpeedFor(peerStat);
bool segmentComplete = false; bool segmentPartComplete = false;
// Note that GrowSegment::complete() always returns false. // Note that GrowSegment::complete() always returns false.
if(_transferEncodingDecoder.isNull() && _contentEncodingDecoder.isNull()) { if(_transferEncodingDecoder.isNull() && _contentEncodingDecoder.isNull()) {
if(segment->complete() || if(segment->complete() ||
segment->getPositionToWrite() == _fileEntry->getLastOffset()) { segment->getPositionToWrite() == _fileEntry->getLastOffset()) {
segmentComplete = true; segmentPartComplete = true;
} else if(segment->getLength() == 0 && bufSize == 0 && } else if(segment->getLength() == 0 && bufSize == 0 &&
!socket->wantRead() && !socket->wantWrite()) { !socket->wantRead() && !socket->wantWrite()) {
segmentComplete = true; segmentPartComplete = true;
} }
} else if(!_transferEncodingDecoder.isNull() && } else if(!_transferEncodingDecoder.isNull() &&
(segment->complete() || segment->getPositionToWrite() == _fileEntry->getLastOffset())) { (segment->complete() || segment->getPositionToWrite() == _fileEntry->getLastOffset())) {
segmentComplete = true; segmentPartComplete = true;
} else if((_transferEncodingDecoder.isNull() || } else if((_transferEncodingDecoder.isNull() ||
_transferEncodingDecoder->finished()) && _transferEncodingDecoder->finished()) &&
(_contentEncodingDecoder.isNull() || (_contentEncodingDecoder.isNull() ||
_contentEncodingDecoder->finished())) { _contentEncodingDecoder->finished())) {
segmentComplete = true; segmentPartComplete = true;
} }
if(!segmentComplete && bufSize == 0 && if(!segmentPartComplete && bufSize == 0 &&
!socket->wantRead() && !socket->wantWrite()) { !socket->wantRead() && !socket->wantWrite()) {
throw DL_RETRY_EX(EX_GOT_EOF); throw DL_RETRY_EX(EX_GOT_EOF);
} }
if(segmentComplete) { if(segmentPartComplete) {
if(segment->complete() || segment->getLength() == 0) { if(segment->complete() || segment->getLength() == 0) {
// If segment->getLength() == 0, the server doesn't provide // If segment->getLength() == 0, the server doesn't provide
// content length, but the client detected that download // content length, but the client detected that download