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

2009-05-18 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

Browse source 
Added source filename(__FILE__) and line number(__LINE__) to
	exception message.	
	* src/AbstractCommand.cc
	* src/AbstractDiskWriter.cc
	* src/AbstractProxyResponseCommand.cc
	* src/BDE.h
	* src/BtAllowedFastMessage.cc
	* src/BtHandshakeMessageValidator.h
	* src/BtHaveAllMessage.cc
	* src/BtHaveNoneMessage.cc
	* src/BtPieceMessage.cc
	* src/BtRejectMessage.cc
	* src/ChunkedDecoder.cc
	* src/CookieStorage.cc
	* src/DHTAnnouncePeerMessage.cc
	* src/DHTEntryPointNameResolveCommand.cc
	* src/DHTMessageFactoryImpl.cc
	* src/DHTMessageTracker.cc
	* src/DHTRoutingTableDeserializer.cc
	* src/DHTRoutingTableSerializer.cc
	* src/DHTSetup.cc
	* src/DHTTokenTracker.cc
	* src/DefaultBtAnnounce.cc
	* src/DefaultBtContext.cc
	* src/DefaultBtInteractive.cc
	* src/DefaultBtMessageFactory.cc
	* src/DefaultBtProgressInfoFile.cc
	* src/DefaultExtensionMessageFactory.cc
	* src/DlAbortEx.h
	* src/DlRetryEx.h
	* src/DownloadCommand.cc
	* src/DownloadEngineFactory.cc
	* src/DownloadFailureException.h
	* src/Exception.cc
	* src/Exception.h
	* src/ExpatMetalinkProcessor.cc
	* src/ExpatXmlRpcRequestProcessor.cc
	* src/FallocFileAllocationIterator.cc
	* src/FatalException.h
	* src/FtpConnection.cc
	* src/FtpFinishDownloadCommand.cc
	* src/FtpInitiateConnectionCommand.cc
	* src/FtpNegotiationCommand.cc
	* src/GZipDecoder.cc
	* src/HandshakeExtensionMessage.cc
	* src/HttpConnection.cc
	* src/HttpHeaderProcessor.cc
	* src/HttpInitiateConnectionCommand.cc
	* src/HttpResponse.cc
	* src/HttpResponseCommand.cc
	* src/HttpServer.cc
	* src/HttpSkipResponseCommand.cc
	* src/InitiateConnectionCommandFactory.cc
	* src/IteratableChunkChecksumValidator.cc
	* src/LibgcryptARC4Context.h
	* src/LibgcryptARC4Decryptor.h
	* src/LibgcryptARC4Encryptor.h
	* src/LibgcryptDHKeyExchange.h
	* src/LibgnutlsTLSContext.cc
	* src/LibsslARC4Context.h
	* src/LibsslARC4Decryptor.h
	* src/LibsslARC4Encryptor.h
	* src/LibsslDHKeyExchange.h
	* src/LibsslTLSContext.cc
	* src/MSEHandshake.cc
	* src/MessageDigestHelper.cc
	* src/MetalinkHelper.cc
	* src/MultiDiskAdaptor.cc
	* src/NameMatchOptionHandler.h
	* src/NameResolver.cc
	* src/Netrc.cc
	* src/NsCookieParser.cc
	* src/OptionHandlerException.cc
	* src/OptionHandlerException.h
	* src/OptionHandlerImpl.h
	* src/OptionParser.cc
	* src/ParameterizedStringParser.cc
	* src/PeerAbstractCommand.cc
	* src/PeerConnection.cc
	* src/PeerMessageUtil.cc
	* src/PeerReceiveHandshakeCommand.cc
	* src/Platform.cc
	* src/ReceiverMSEHandshakeCommand.cc
	* src/RecoverableException.h
	* src/RequestGroup.cc
	* src/SimpleLogger.cc
	* src/SocketCore.cc
	* src/Sqlite3MozCookieParser.cc
	* src/UTPexExtensionMessage.cc
	* src/Util.cc
	* src/XML2SAXMetalinkProcessor.cc
	* src/Xml2XmlRpcRequestProcessor.cc
	* src/XmlRpcMethodImpl.cc
	* src/bencode.cc
	* src/download_helper.cc
	* src/messageDigest.h
	* test/ExceptionTest.cc
	* test/TestUtil.cc
This commit is contained in:
Tatsuhiro Tsujikawa 2009-05-18 15:07:15 +00:00
parent ff83fc65df
commit 20e215047c
97 changed files with 638 additions and 462 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/XmlRpcMethodImpl.cc
View file

@ -86,7 +86,7 @@ BDE AddUriXmlRpcMethod::process(const XmlRpcRequest& req, DownloadEngine* e)
const BDE& params = req._params;
assert(params.isList());
if(params.empty() || !params[0].isList() || params[0].empty()) {
throw DlAbortEx("URI is not provided.");
throw DL_ABORT_EX("URI is not provided.");
}
std::deque<std::string> uris;
for(BDE::List::const_iterator i = params[0].listBegin();
@ -109,7 +109,7 @@ BDE AddUriXmlRpcMethod::process(const XmlRpcRequest& req, DownloadEngine* e)
e->_requestGroupMan->addReservedGroup(result.front());
return createGIDResponse(result.front()->getGID());
} else {
throw DlAbortEx("No URI to download.");
throw DL_ABORT_EX("No URI to download.");
}
}
@ -119,7 +119,7 @@ BDE AddTorrentXmlRpcMethod::process
const BDE& params = req._params;
assert(params.isList());
if(params.empty() || !params[0].isString()) {
throw DlAbortEx("Torrent data is not provided.");
throw DL_ABORT_EX("Torrent data is not provided.");
}
std::deque<std::string> uris;
@ -145,7 +145,7 @@ BDE AddTorrentXmlRpcMethod::process
e->_requestGroupMan->addReservedGroup(result.front());
return createGIDResponse(result.front()->getGID());
} else {
throw DlAbortEx("No Torrent to download.");
throw DL_ABORT_EX("No Torrent to download.");
}
}
@ -155,7 +155,7 @@ BDE AddMetalinkXmlRpcMethod::process
const BDE& params = req._params;
assert(params.isList());
if(params.empty() || !params[0].isString()) {
throw DlAbortEx("Metalink data is not provided.");
throw DL_ABORT_EX("Metalink data is not provided.");
}
SharedHandle<Option> requestOption(new Option(*e->option));
@ -173,7 +173,7 @@ BDE AddMetalinkXmlRpcMethod::process
}
return gids;
} else {
throw DlAbortEx("No files to download.");
throw DL_ABORT_EX("No files to download.");
}
}
@ -184,7 +184,7 @@ BDE RemoveXmlRpcMethod::process(const XmlRpcRequest& req, DownloadEngine* e)
assert(params.isList());
if(params.empty() || !params[0].isString()) {
throw DlAbortEx(MSG_GID_NOT_PROVIDED);
throw DL_ABORT_EX(MSG_GID_NOT_PROVIDED);
}
int32_t gid = Util::parseInt(params[0].s());
@ -194,13 +194,13 @@ BDE RemoveXmlRpcMethod::process(const XmlRpcRequest& req, DownloadEngine* e)
if(group.isNull()) {
group = e->_requestGroupMan->findReservedGroup(gid);
if(group.isNull()) {
throw DlAbortEx
throw DL_ABORT_EX
(StringFormat("Active Download not found for GID#%d", gid).str());
}
if(group->isDependencyResolved()) {
e->_requestGroupMan->removeReservedGroup(gid);
} else {
throw DlAbortEx
throw DL_ABORT_EX
(StringFormat("GID#%d cannot be removed now", gid).str());
}
} else {
@ -320,7 +320,7 @@ BDE GetFilesXmlRpcMethod::process
assert(params.isList());
if(params.empty() || !params[0].isString()) {
throw DlAbortEx(MSG_GID_NOT_PROVIDED);
throw DL_ABORT_EX(MSG_GID_NOT_PROVIDED);
}
int32_t gid = Util::parseInt(params[0].s());
@ -331,7 +331,7 @@ BDE GetFilesXmlRpcMethod::process
SharedHandle<DownloadResult> dr =
e->_requestGroupMan->findDownloadResult(gid);
if(dr.isNull()) {
throw DlAbortEx
throw DL_ABORT_EX
(StringFormat("No file data is available for GID#%d", gid).str());
} else {
createFileEntry(files, dr->fileEntries.begin(), dr->fileEntries.end());
@ -351,14 +351,14 @@ BDE GetUrisXmlRpcMethod::process
assert(params.isList());
if(params.empty() || !params[0].isString()) {
throw DlAbortEx(MSG_GID_NOT_PROVIDED);
throw DL_ABORT_EX(MSG_GID_NOT_PROVIDED);
}
int32_t gid = Util::parseInt(params[0].s());
SharedHandle<RequestGroup> group = findRequestGroup(e->_requestGroupMan, gid);
if(group.isNull()) {
throw DlAbortEx
throw DL_ABORT_EX
(StringFormat("No URI data is available for GID#%d", gid).str());
}
BDE uriList = BDE::list();
@ -380,14 +380,14 @@ BDE GetPeersXmlRpcMethod::process
assert(params.isList());
if(params.empty() || !params[0].isString()) {
throw DlAbortEx(MSG_GID_NOT_PROVIDED);
throw DL_ABORT_EX(MSG_GID_NOT_PROVIDED);
}
int32_t gid = Util::parseInt(params[0].s());
SharedHandle<RequestGroup> group = findRequestGroup(e->_requestGroupMan, gid);
if(group.isNull()) {
throw DlAbortEx
throw DL_ABORT_EX
(StringFormat("No peer data is available for GID#%d", gid).str());
}
BDE peers = BDE::list();
@ -412,7 +412,7 @@ BDE TellStatusXmlRpcMethod::process
assert(params.isList());
if(params.empty() || !params[0].isString()) {
throw DlAbortEx(MSG_GID_NOT_PROVIDED);
throw DL_ABORT_EX(MSG_GID_NOT_PROVIDED);
}
int32_t gid = Util::parseInt(params[0].s());
@ -426,7 +426,7 @@ BDE TellStatusXmlRpcMethod::process
SharedHandle<DownloadResult> ds =
e->_requestGroupMan->findDownloadResult(gid);
if(ds.isNull()) {
throw DlAbortEx
throw DL_ABORT_EX
(StringFormat("No such download for GID#%d", gid).str());
}
gatherStoppedDownload(entryDict, ds);
@ -503,13 +503,13 @@ BDE ChangeOptionXmlRpcMethod::process
const BDE& params = req._params;
assert(params.isList());
if(params.empty() || !params[0].isString()) {
throw DlAbortEx(MSG_GID_NOT_PROVIDED);
throw DL_ABORT_EX(MSG_GID_NOT_PROVIDED);
}
int32_t gid = Util::parseInt(params[0].s());
SharedHandle<RequestGroup> group = findRequestGroup(e->_requestGroupMan, gid);
if(group.isNull()) {
throw DlAbortEx
throw DL_ABORT_EX
(StringFormat("Cannot change option for GID#%d", gid).str());
}
SharedHandle<Option> option(new Option(*group->getOption().get()));
@ -549,7 +549,7 @@ BDE ChangeGlobalOptionXmlRpcMethod::process
BDE NoSuchMethodXmlRpcMethod::process
(const XmlRpcRequest& req, DownloadEngine* e)
{
throw DlAbortEx
throw DL_ABORT_EX
(StringFormat("No such method: %s", req._methodName.c_str()).str());
}