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

2010-06-09 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Code cleanup
	* src/AbstractCommand.cc
pull/1/head
Tatsuhiro Tsujikawa 2010-06-09 14:01:18 +00:00
parent 970e7f95a6
commit bc50b5eea2
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2010-06-09 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Code cleanup
* src/AbstractCommand.cc
2010-06-09 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2010-06-09 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Made protected member variable private. Added accessor funcs. Made protected member variable private. Added accessor funcs.

8
src/AbstractCommand.cc
View File

@ -167,7 +167,7 @@ bool AbstractCommand::execute() {
return prepareForRetry(0); return prepareForRetry(0);
} }
if(_req.isNull() || _req->getMaxPipelinedRequest() == 1 || if(_req.isNull() || _req->getMaxPipelinedRequest() == 1 ||
_requestGroup->getDownloadContext()->getFileEntries().size() == 1) { getDownloadContext()->getFileEntries().size() == 1) {
if(_segments.empty()) { if(_segments.empty()) {
SharedHandle<Segment> segment = SharedHandle<Segment> segment =
getSegmentMan()->getSegment(getCuid()); getSegmentMan()->getSegment(getCuid());
@ -287,9 +287,9 @@ bool AbstractCommand::execute() {
} }
void AbstractCommand::tryReserved() { void AbstractCommand::tryReserved() {
if(_requestGroup->getDownloadContext()->getFileEntries().size() == 1) { if(getDownloadContext()->getFileEntries().size() == 1) {
const SharedHandle<FileEntry>& entry = const SharedHandle<FileEntry>& entry =
_requestGroup->getDownloadContext()->getFirstFileEntry(); getDownloadContext()->getFirstFileEntry();
// 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.
@ -361,7 +361,7 @@ void AbstractCommand::onAbort() {
!_fileEntry.isNull() && !_fileEntry.isNull() &&
getSegmentMan()->calculateSessionDownloadLength() == 0 && getSegmentMan()->calculateSessionDownloadLength() == 0 &&
!_requestGroup->p2pInvolved() && !_requestGroup->p2pInvolved() &&
_requestGroup->getDownloadContext()->getFileEntries().size() == 1) { getDownloadContext()->getFileEntries().size() == 1) {
const int maxTries = getOption()->getAsInt(PREF_MAX_RESUME_FAILURE_TRIES); const int maxTries = getOption()->getAsInt(PREF_MAX_RESUME_FAILURE_TRIES);
if((maxTries > 0 && _requestGroup->getResumeFailureCount() >= maxTries)|| if((maxTries > 0 && _requestGroup->getResumeFailureCount() >= maxTries)||
_fileEntry->emptyRequestUri()) { _fileEntry->emptyRequestUri()) {