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

2009-03-10 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Rewritten isSameFileBeingDownloaded()
	* src/RequestGroupMan.cc
pull/1/head
Tatsuhiro Tsujikawa 2009-03-10 12:58:38 +00:00
parent 849a533d61
commit 173a86febc
2 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2009-03-10 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Rewritten isSameFileBeingDownloaded()
* src/RequestGroupMan.cc
2009-03-10 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2009-03-10 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Removed getName() from DownloadContext. getName() is declared in Removed getName() from DownloadContext. getName() is declared in

42
src/RequestGroupMan.cc
View File

@ -63,6 +63,7 @@
#include "File.h" #include "File.h"
#include "Util.h" #include "Util.h"
#include "Command.h" #include "Command.h"
#include "FileEntry.h"
namespace aria2 { namespace aria2 {
@ -508,22 +509,45 @@ std::string RequestGroupMan::formatDownloadResult(const std::string& status, con
return o.str(); return o.str();
} }
bool RequestGroupMan::isSameFileBeingDownloaded(RequestGroup* requestGroup) const template<typename StringInputIterator, typename FileEntryInputIterator>
static bool sameFilePathExists(StringInputIterator sfirst,
StringInputIterator slast,
FileEntryInputIterator ffirst,
FileEntryInputIterator flast)
{ {
// TODO it may be good to use dedicated method rather than use isPreLocalFileCheckEnabled for(; ffirst != flast; ++ffirst) {
if(!requestGroup->isPreLocalFileCheckEnabled()) { if(std::binary_search(sfirst, slast, (*ffirst)->getPath())) {
return false;
}
for(RequestGroups::const_iterator itr = _requestGroups.begin();
itr != _requestGroups.end(); ++itr) {
if((*itr).get() != requestGroup &&
(*itr)->getFilePath() == requestGroup->getFilePath()) {
return true; return true;
} }
} }
return false; return false;
} }
bool RequestGroupMan::isSameFileBeingDownloaded(RequestGroup* requestGroup) const
{
// TODO it may be good to use dedicated method rather than use
// isPreLocalFileCheckEnabled
if(!requestGroup->isPreLocalFileCheckEnabled()) {
return false;
}
std::deque<std::string> files;
for(RequestGroups::const_iterator itr = _requestGroups.begin();
itr != _requestGroups.end(); ++itr) {
if((*itr).get() != requestGroup) {
std::deque<SharedHandle<FileEntry> > entries =
(*itr)->getDownloadContext()->getFileEntries();
std::transform(entries.begin(), entries.end(),
std::back_inserter(files),
mem_fun_sh(&FileEntry::getPath));
}
}
std::sort(files.begin(), files.end());
std::deque<SharedHandle<FileEntry> > entries =
requestGroup->getDownloadContext()->getFileEntries();
return sameFilePathExists(files.begin(), files.end(),
entries.begin(), entries.end());
}
void RequestGroupMan::halt() void RequestGroupMan::halt()
{ {
for(RequestGroups::const_iterator itr = _requestGroups.begin(); for(RequestGroups::const_iterator itr = _requestGroups.begin();