mirrors/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2025-04-06 14:07:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Removed getName() from DownloadContext. getName() is declared in
	BtContext.
	* src/BtContext.h
	* src/DownloadContext.h
	* src/SingleFileDownloadContext.cc
	* src/SingleFileDownloadContext.h
		
	Removed getFilePath() from DiskAdaptor. getFilePath() is
	declared in AbstractSingleDiskAdaptor.
	* src/AbstractSingleDiskAdaptor.h
	* src/DiskAdaptor.h
	* src/MultiDiskAdaptor.h
	* src/RequestGroup.cc
	
	Removed setTopDir() and getTopDir() and getTopDirPath() from
	MultiDiskAdaptor.
	* src/DefaultPieceStorage.cc
	* src/MultiDiskAdaptor.cc
	* src/MultiDiskAdaptor.h
	* test/MultiDiskAdaptorTest.cc
This commit is contained in:
Tatsuhiro Tsujikawa 2009-03-10 12:24:29 +00:00
parent e2704bd823
commit 849a533d61
12 changed files with 31 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

23
ChangeLog
View file

@ -1,3 +1,26 @@
2009-03-10 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Removed getName() from DownloadContext. getName() is declared in
BtContext.
* src/BtContext.h
* src/DownloadContext.h
* src/SingleFileDownloadContext.cc
* src/SingleFileDownloadContext.h
Removed getFilePath() from DiskAdaptor. getFilePath() is declared
in AbstractSingleDiskAdaptor.
* src/AbstractSingleDiskAdaptor.h
* src/DiskAdaptor.h
* src/MultiDiskAdaptor.h
* src/RequestGroup.cc
Removed setTopDir() and getTopDir() and getTopDirPath() from
MultiDiskAdaptor.
* src/DefaultPieceStorage.cc
* src/MultiDiskAdaptor.cc
* src/MultiDiskAdaptor.h
* test/MultiDiskAdaptorTest.cc
2009-03-10 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
FileEntry::getPath() contains store(top level) directory to

2
src/AbstractSingleDiskAdaptor.h
View file

@ -86,6 +86,8 @@ public:
virtual void cutTrailingGarbage();
virtual std::string getFilePath() = 0;
void setDiskWriter(const SharedHandle<DiskWriter>& diskWriter);
SharedHandle<DiskWriter> getDiskWriter() const;

2
src/BtContext.h
View file

@ -85,6 +85,8 @@ public:
virtual std::deque<std::pair<std::string, uint16_t> >& getNodes() = 0;
virtual const std::string& getName() const = 0;
void setFileFilter(const IntSequence& seq);
IntSequence getFileFilter() const;

4
src/DefaultPieceStorage.cc
View file

@ -495,7 +495,6 @@ void DefaultPieceStorage::initStorage()
MultiDiskAdaptorHandle multiDiskAdaptor(new MultiDiskAdaptor());
multiDiskAdaptor->setDirectIOAllowed(option->getAsBool(PREF_ENABLE_DIRECT_IO));
multiDiskAdaptor->setPieceLength(downloadContext->getPieceLength());
multiDiskAdaptor->setTopDir(downloadContext->getName());
multiDiskAdaptor->setMaxOpenFiles(option->getAsInt(PREF_BT_MAX_OPEN_FILES));
this->diskAdaptor = multiDiskAdaptor;
} else {
@ -504,9 +503,8 @@ void DefaultPieceStorage::initStorage()
writer->setDirectIOAllowed(option->getAsBool(PREF_ENABLE_DIRECT_IO));
CopyDiskAdaptorHandle copyDiskAdaptor(new CopyDiskAdaptor());
copyDiskAdaptor->setDiskWriter(writer);
copyDiskAdaptor->setTempFilename(downloadContext->getName()+".a2tmp");
//copyDiskAdaptor->setTempFilename(downloadContext->getName()+".a2tmp");
copyDiskAdaptor->setTotalLength(downloadContext->getTotalLength());
copyDiskAdaptor->setTopDir(downloadContext->getName());
this->diskAdaptor = copyDiskAdaptor;
}
}

2
src/DiskAdaptor.h
View file

@ -67,8 +67,6 @@ public:
virtual bool fileExists() = 0;
virtual std::string getFilePath() = 0;
virtual uint64_t size() = 0;
// optional behavior

2
src/DownloadContext.h
View file

@ -81,8 +81,6 @@ public:
virtual std::deque<SharedHandle<FileEntry> > getFileEntries() const = 0;
virtual const std::string& getName() const = 0;
virtual size_t getPieceLength() const = 0;
virtual size_t getNumPieces() const = 0;

8
src/MultiDiskAdaptor.cc
View file

@ -282,11 +282,6 @@ void MultiDiskAdaptor::resetDiskWriterEntries()
}
}
std::string MultiDiskAdaptor::getTopDirPath() const
{
return storeDir+"/"+topDir;
}
void MultiDiskAdaptor::mkdir() const
{
for(std::deque<SharedHandle<DiskWriterEntry> >::const_iterator i =
@ -473,9 +468,6 @@ ssize_t MultiDiskAdaptor::readData(unsigned char* data, size_t len, off_t offset
bool MultiDiskAdaptor::fileExists()
{
// TODO Use FileEntry::fileExists() here.
// Don't use _cachedTopDirPath because they are initialized after opening files.
// This method could be called before opening files.
for(std::deque<SharedHandle<FileEntry> >::iterator i =
fileEntries.begin(); i != fileEntries.end(); ++i) {
if(File((*i)->getPath()).exists()) {

16
src/MultiDiskAdaptor.h
View file

@ -101,7 +101,6 @@ typedef std::deque<DiskWriterEntryHandle> DiskWriterEntries;
class MultiDiskAdaptor : public DiskAdaptor {
friend class MultiFileAllocationIterator;
private:
std::string topDir;
size_t pieceLength;
DiskWriterEntries diskWriterEntries;
@ -117,8 +116,6 @@ private:
void mkdir() const;
std::string getTopDirPath() const;
void openIfNot(const SharedHandle<DiskWriterEntry>& entry,
void (DiskWriterEntry::*f)());
@ -146,11 +143,6 @@ public:
virtual bool fileExists();
virtual std::string getFilePath()
{
return getTopDirPath();
}
virtual uint64_t size();
virtual SharedHandle<FileAllocationIterator> fileAllocationIterator();
@ -163,14 +155,6 @@ public:
virtual void disableReadOnly();
void setTopDir(const std::string& topDir) {
this->topDir = topDir;
}
const std::string& getTopDir() const {
return topDir;
}
void setPieceLength(size_t pieceLength) {
this->pieceLength = pieceLength;
}

6
src/RequestGroup.cc
View file

@ -276,7 +276,7 @@ void RequestGroup::createInitialCommand(std::deque<Command*>& commands,
progressInfoFile->removeFile();
_logger->notice(MSG_REMOVED_DEFUNCT_CONTROL_FILE,
progressInfoFile->getFilename().c_str(),
_pieceStorage->getDiskAdaptor()->getFilePath().c_str());
getFilePath().c_str());
}
// First, make DiskAdaptor read-only mode.
_pieceStorage->getDiskAdaptor()->enableReadOnly();
@ -295,7 +295,7 @@ void RequestGroup::createInitialCommand(std::deque<Command*>& commands,
throw DownloadFailureException
(StringFormat
(MSG_FILE_ALREADY_EXISTS,
_pieceStorage->getDiskAdaptor()->getFilePath().c_str()).str());
getFilePath().c_str()).str());
} else {
_pieceStorage->getDiskAdaptor()->openFile();
}
@ -443,7 +443,7 @@ void RequestGroup::loadAndOpenFile(const BtProgressInfoFileHandle& progressInfoF
progressInfoFile->removeFile();
_logger->notice(MSG_REMOVED_DEFUNCT_CONTROL_FILE,
progressInfoFile->getFilename().c_str(),
_pieceStorage->getDiskAdaptor()->getFilePath().c_str());
getFilePath().c_str());
}
while(1) {
if(progressInfoFile->exists()) {

5
src/SingleFileDownloadContext.cc
View file

@ -107,9 +107,4 @@ void SingleFileDownloadContext::markTotalLengthIsUnknown()
_knowsTotalLength = false;
}
const std::string& SingleFileDownloadContext::getName() const
{
return _fileEntry->getPath();
}
} // namespace aria2

2
src/SingleFileDownloadContext.h
View file

@ -97,8 +97,6 @@ public:
virtual std::deque<SharedHandle<FileEntry> > getFileEntries() const;
virtual const std::string& getName() const;
virtual size_t getPieceLength() const
{
return _pieceLength;

1
test/MultiDiskAdaptorTest.cc
View file

@ -32,7 +32,6 @@ public:
adaptor.reset(new MultiDiskAdaptor());
adaptor->setPieceLength(2);
adaptor->setStoreDir(".");
adaptor->setTopDir(".");
}
void testWriteData();