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

2008-05-19 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> 

Returns const reference:
	DownloadContext::getPieceHash, DownloadContext::getName,
	DownloadContext::getPieceHashAlgo, DownloadContext::getDir,
	BtContext::getInfoHashAsString,
	* src/BtContext.h
	* src/DefaultBtContext.cc
	* src/DefaultBtContext.h
	* src/DownloadContext.h
	* src/SingleFileDownloadContext.h
	* test/MockBtContext.h
pull/1/head
Tatsuhiro Tsujikawa 2008-05-19 11:28:17 +00:00
parent 960d4acbce
commit ff6b5ecc9c
7 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2008-05-19 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Returns const reference:
DownloadContext::getPieceHash, DownloadContext::getName,
DownloadContext::getPieceHashAlgo, DownloadContext::getDir,
BtContext::getInfoHashAsString,
* src/BtContext.h
* src/DefaultBtContext.cc
* src/DefaultBtContext.h
* src/DownloadContext.h
* src/SingleFileDownloadContext.h
* test/MockBtContext.h
2008-05-19 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> 2008-05-19 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
* src/RequestGroup.h (getDir): Removed. * src/RequestGroup.h (getDir): Removed.

2
src/BtContext.h
View File

@ -56,7 +56,7 @@ public:
virtual size_t getInfoHashLength() const = 0; virtual size_t getInfoHashLength() const = 0;
virtual std::string getInfoHashAsString() const = 0; virtual const std::string& getInfoHashAsString() const = 0;
virtual std::deque<SharedHandle<AnnounceTier> > virtual std::deque<SharedHandle<AnnounceTier> >
getAnnounceTiers() const = 0; getAnnounceTiers() const = 0;

11
src/DefaultBtContext.cc
View File

@ -84,7 +84,7 @@ size_t DefaultBtContext::getInfoHashLength() const {
return INFO_HASH_LENGTH; return INFO_HASH_LENGTH;
} }
std::string DefaultBtContext::getInfoHashAsString() const { const std::string& DefaultBtContext::getInfoHashAsString() const {
return infoHashString; return infoHashString;
} }
@ -369,7 +369,7 @@ void DefaultBtContext::processRootDictionary(const Dictionary* rootDic, const st
} }
} }
std::string DefaultBtContext::getPieceHash(size_t index) const { const std::string& DefaultBtContext::getPieceHash(size_t index) const {
if(index < numPieces) { if(index < numPieces) {
return pieceHashes[index]; return pieceHashes[index];
} else { } else {
@ -389,11 +389,16 @@ FileEntries DefaultBtContext::getFileEntries() const {
return fileEntries; return fileEntries;
} }
const std::string& DefaultBtContext::getPieceHashAlgo() const
{
return MessageDigestContext::SHA1;
}
AnnounceTiers DefaultBtContext::getAnnounceTiers() const { AnnounceTiers DefaultBtContext::getAnnounceTiers() const {
return announceTiers; return announceTiers;
} }
std::string DefaultBtContext::getName() const { const std::string& DefaultBtContext::getName() const {
return name; return name;
} }

11
src/DefaultBtContext.h
View File

@ -96,9 +96,9 @@ private:
virtual size_t getInfoHashLength() const; virtual size_t getInfoHashLength() const;
virtual std::string getInfoHashAsString() const; virtual const std::string& getInfoHashAsString() const;
virtual std::string getPieceHash(size_t index) const; virtual const std::string& getPieceHash(size_t index) const;
virtual const std::deque<std::string>& getPieceHashes() const virtual const std::deque<std::string>& getPieceHashes() const
{ {
@ -111,10 +111,7 @@ private:
virtual std::deque<SharedHandle<FileEntry> > getFileEntries() const; virtual std::deque<SharedHandle<FileEntry> > getFileEntries() const;
virtual std::string getPieceHashAlgo() const virtual const std::string& getPieceHashAlgo() const;
{
return "sha1";
}
virtual std::deque<SharedHandle<AnnounceTier> > getAnnounceTiers() const; virtual std::deque<SharedHandle<AnnounceTier> > getAnnounceTiers() const;
@ -129,7 +126,7 @@ private:
context.size(), defaultName); context.size(), defaultName);
} }
virtual std::string getName() const; virtual const std::string& getName() const;
virtual size_t getPieceLength() const; virtual size_t getPieceLength() const;

8
src/DownloadContext.h
View File

@ -60,7 +60,7 @@ public:
MULTI MULTI
}; };
virtual std::string getPieceHash(size_t index) const = 0; virtual const std::string& getPieceHash(size_t index) const = 0;
virtual const std::deque<std::string>& getPieceHashes() const = 0; virtual const std::deque<std::string>& getPieceHashes() const = 0;
@ -70,13 +70,13 @@ public:
virtual std::deque<SharedHandle<FileEntry> > getFileEntries() const = 0; virtual std::deque<SharedHandle<FileEntry> > getFileEntries() const = 0;
virtual std::string getName() const = 0; virtual const std::string& getName() const = 0;
virtual size_t getPieceLength() const = 0; virtual size_t getPieceLength() const = 0;
virtual size_t getNumPieces() const = 0; virtual size_t getNumPieces() const = 0;
virtual std::string getPieceHashAlgo() const = 0; virtual const std::string& getPieceHashAlgo() const = 0;
/** /**
* Returns an actual file path. * Returns an actual file path.
@ -88,7 +88,7 @@ public:
*/ */
virtual std::string getActualBasePath() const = 0; virtual std::string getActualBasePath() const = 0;
std::string getDir() const const std::string& getDir() const
{ {
return _dir; return _dir;
} }

6
src/SingleFileDownloadContext.h
View File

@ -75,7 +75,7 @@ public:
virtual ~SingleFileDownloadContext() {} virtual ~SingleFileDownloadContext() {}
virtual std::string getPieceHash(size_t index) const virtual const std::string& getPieceHash(size_t index) const
{ {
if(index < _pieceHashes.size()) { if(index < _pieceHashes.size()) {
return _pieceHashes[index]; return _pieceHashes[index];
@ -95,7 +95,7 @@ public:
virtual std::deque<SharedHandle<FileEntry> > getFileEntries() const; virtual std::deque<SharedHandle<FileEntry> > getFileEntries() const;
virtual std::string getName() const virtual const std::string& getName() const
{ {
return _filename; return _filename;
} }
@ -109,7 +109,7 @@ public:
virtual std::string getActualBasePath() const; virtual std::string getActualBasePath() const;
virtual std::string getPieceHashAlgo() const virtual const std::string& getPieceHashAlgo() const
{ {
return _pieceHashAlgo; return _pieceHashAlgo;
} }

15
test/MockBtContext.h
View File

@ -4,6 +4,7 @@
#include "BtContext.h" #include "BtContext.h"
#include "Util.h" #include "Util.h"
#include "AnnounceTier.h" #include "AnnounceTier.h"
#include "messageDigest.h"
#include <cstring> #include <cstring>
namespace aria2 { namespace aria2 {
@ -11,6 +12,7 @@ namespace aria2 {
class MockBtContext : public BtContext { class MockBtContext : public BtContext {
private: private:
unsigned char infoHash[20]; unsigned char infoHash[20];
std::string _infoHashString;
std::deque<std::string> pieceHashes; std::deque<std::string> pieceHashes;
uint64_t totalLength; uint64_t totalLength;
FILE_MODE fileMode; FILE_MODE fileMode;
@ -35,17 +37,18 @@ public:
void setInfoHash(const unsigned char* infoHash) { void setInfoHash(const unsigned char* infoHash) {
memcpy(this->infoHash, infoHash, sizeof(this->infoHash)); memcpy(this->infoHash, infoHash, sizeof(this->infoHash));
_infoHashString = Util::toHex(this->infoHash, sizeof(this->infoHash));
} }
virtual size_t getInfoHashLength() const { virtual size_t getInfoHashLength() const {
return sizeof(infoHash); return sizeof(infoHash);
} }
virtual std::string getInfoHashAsString() const { virtual const std::string& getInfoHashAsString() const {
return Util::toHex(infoHash, sizeof(infoHash)); return _infoHashString;
} }
virtual std::string getPieceHash(size_t index) const { virtual const std::string& getPieceHash(size_t index) const {
return pieceHashes.at(index); return pieceHashes.at(index);
} }
@ -91,7 +94,7 @@ public:
virtual void load(const std::string& torrentFile) {} virtual void load(const std::string& torrentFile) {}
virtual std::string getName() const { virtual const std::string& getName() const {
return name; return name;
} }
@ -134,9 +137,9 @@ public:
this->fastSet = fastSet; this->fastSet = fastSet;
} }
virtual std::string getPieceHashAlgo() const virtual const std::string& getPieceHashAlgo() const
{ {
return "sha1"; return MessageDigestContext::SHA1;
} }
virtual std::string getActualBasePath() const virtual std::string getActualBasePath() const