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

Use merged option values.

pull/2/head
Tatsuhiro Tsujikawa 2011-11-02 00:32:58 +09:00
parent 1a418b518c
commit d9833743d9
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/RpcMethodImpl.cc
View File

@ -1123,25 +1123,26 @@ void changeOption
DownloadEngine* e) DownloadEngine* e)
{ {
const SharedHandle<DownloadContext>& dctx = group->getDownloadContext(); const SharedHandle<DownloadContext>& dctx = group->getDownloadContext();
group->getOption()->merge(option); const SharedHandle<Option>& grOption = group->getOption();
grOption->merge(option);
if(option.defined(PREF_CHECKSUM)) { if(option.defined(PREF_CHECKSUM)) {
std::pair<std::string, std::string> p; std::pair<std::string, std::string> p;
util::divide(p, option.get(PREF_CHECKSUM), '='); util::divide(p, grOption->get(PREF_CHECKSUM), '=');
util::lowercase(p.first); util::lowercase(p.first);
util::lowercase(p.second); util::lowercase(p.second);
dctx->setDigest(p.first, util::fromHex(p.second)); dctx->setDigest(p.first, util::fromHex(p.second));
} }
if(option.defined(PREF_SELECT_FILE)) { if(option.defined(PREF_SELECT_FILE)) {
SegList<int> sgl; SegList<int> sgl;
util::parseIntSegments(sgl, option.get(PREF_SELECT_FILE)); util::parseIntSegments(sgl, grOption->get(PREF_SELECT_FILE));
sgl.normalize(); sgl.normalize();
dctx->setFileFilter(sgl); dctx->setFileFilter(sgl);
} }
if(option.defined(PREF_SPLIT)) { if(option.defined(PREF_SPLIT)) {
group->setNumConcurrentCommand(option.getAsInt(PREF_SPLIT)); group->setNumConcurrentCommand(grOption->getAsInt(PREF_SPLIT));
} }
if(option.defined(PREF_MAX_CONNECTION_PER_SERVER)) { if(option.defined(PREF_MAX_CONNECTION_PER_SERVER)) {
int maxConn = option.getAsInt(PREF_MAX_CONNECTION_PER_SERVER); int maxConn = grOption->getAsInt(PREF_MAX_CONNECTION_PER_SERVER);
const std::vector<SharedHandle<FileEntry> >& files = dctx->getFileEntries(); const std::vector<SharedHandle<FileEntry> >& files = dctx->getFileEntries();
for(std::vector<SharedHandle<FileEntry> >::const_iterator i = files.begin(), for(std::vector<SharedHandle<FileEntry> >::const_iterator i = files.begin(),
eoi = files.end(); i != eoi; ++i) { eoi = files.end(); i != eoi; ++i) {
@ -1152,37 +1153,36 @@ void changeOption
if(dctx->getFileEntries().size() == 1 && if(dctx->getFileEntries().size() == 1 &&
!dctx->hasAttribute(bittorrent::BITTORRENT)) { !dctx->hasAttribute(bittorrent::BITTORRENT)) {
dctx->getFirstFileEntry()->setPath dctx->getFirstFileEntry()->setPath
(group->getOption()->blank(PREF_OUT) ? A2STR::NIL : (grOption->blank(PREF_OUT) ? A2STR::NIL :
util::applyDir(group->getOption()->get(PREF_DIR), util::applyDir(grOption->get(PREF_DIR), grOption->get(PREF_OUT)));
group->getOption()->get(PREF_OUT)));
} }
} }
if(option.defined(PREF_DIR) || option.defined(PREF_INDEX_OUT)) { if(option.defined(PREF_DIR) || option.defined(PREF_INDEX_OUT)) {
if(dctx->hasAttribute(bittorrent::BITTORRENT)) { if(dctx->hasAttribute(bittorrent::BITTORRENT)) {
std::istringstream indexOutIn(group->getOption()->get(PREF_INDEX_OUT)); std::istringstream indexOutIn(grOption->get(PREF_INDEX_OUT));
std::vector<std::pair<size_t, std::string> > indexPaths = std::vector<std::pair<size_t, std::string> > indexPaths =
util::createIndexPaths(indexOutIn); util::createIndexPaths(indexOutIn);
for(std::vector<std::pair<size_t, std::string> >::const_iterator i = for(std::vector<std::pair<size_t, std::string> >::const_iterator i =
indexPaths.begin(), eoi = indexPaths.end(); i != eoi; ++i) { indexPaths.begin(), eoi = indexPaths.end(); i != eoi; ++i) {
dctx->setFilePathWithIndex dctx->setFilePathWithIndex
((*i).first, ((*i).first,
util::applyDir(group->getOption()->get(PREF_DIR), (*i).second)); util::applyDir(grOption->get(PREF_DIR), (*i).second));
} }
} }
} }
if(option.defined(PREF_MAX_DOWNLOAD_LIMIT)) { if(option.defined(PREF_MAX_DOWNLOAD_LIMIT)) {
group->setMaxDownloadSpeedLimit group->setMaxDownloadSpeedLimit
(option.getAsInt(PREF_MAX_DOWNLOAD_LIMIT)); (grOption->getAsInt(PREF_MAX_DOWNLOAD_LIMIT));
} }
if(option.defined(PREF_MAX_UPLOAD_LIMIT)) { if(option.defined(PREF_MAX_UPLOAD_LIMIT)) {
group->setMaxUploadSpeedLimit(option.getAsInt(PREF_MAX_UPLOAD_LIMIT)); group->setMaxUploadSpeedLimit(grOption->getAsInt(PREF_MAX_UPLOAD_LIMIT));
} }
#ifdef ENABLE_BITTORRENT #ifdef ENABLE_BITTORRENT
const SharedHandle<BtObject>& btObject = const SharedHandle<BtObject>& btObject =
e->getBtRegistry()->get(group->getGID()); e->getBtRegistry()->get(group->getGID());
if(btObject) { if(btObject) {
if(option.defined(PREF_BT_MAX_PEERS)) { if(option.defined(PREF_BT_MAX_PEERS)) {
btObject->btRuntime->setMaxPeers(option.getAsInt(PREF_BT_MAX_PEERS)); btObject->btRuntime->setMaxPeers(grOption->getAsInt(PREF_BT_MAX_PEERS));
} }
} }
#endif // ENABLE_BITTORRENT #endif // ENABLE_BITTORRENT