pull/1/head
Tatsuhiro Tsujikawa 2007-06-05 14:03:26 +00:00
parent 2722c0591f
commit 2b07d13be3
6 changed files with 8 additions and 8 deletions

View File

@ -227,9 +227,9 @@ libaria2c_a_SOURCES = $(SRCS)
aria2c_LDADD = libaria2c.a @LIBINTL@ @ALLOCA@ @LIBGNUTLS_LIBS@\ aria2c_LDADD = libaria2c.a @LIBINTL@ @ALLOCA@ @LIBGNUTLS_LIBS@\
@LIBGCRYPT_LIBS@ @OPENSSL_LIBS@ @XML_LIBS@ @LIBARES_LIBS@\ @LIBGCRYPT_LIBS@ @OPENSSL_LIBS@ @XML_LIBS@ @LIBARES_LIBS@\
@LIBCARES_LIBS@ @LIBCARES_LIBS@
aria2c_LDFLAGS = -pg #aria2c_LDFLAGS = -pg
AM_CPPFLAGS = -Wall\ AM_CPPFLAGS = -Wall\
-I../lib -I../intl -I$(top_srcdir)/intl\ -I../lib -I../intl -I$(top_srcdir)/intl\
@LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@\ @LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@\
@LIBARES_CPPFLAGS@ @LIBCARES_CPPFLAGS@\ @LIBARES_CPPFLAGS@ @LIBCARES_CPPFLAGS@\
-D_FILE_OFFSET_BITS=64 -DLOCALEDIR=\"$(localedir)\" @DEFS@ -pg -D_FILE_OFFSET_BITS=64 -DLOCALEDIR=\"$(localedir)\" @DEFS@ # -pg

View File

@ -668,12 +668,12 @@ aria2c_LDADD = libaria2c.a @LIBINTL@ @ALLOCA@ @LIBGNUTLS_LIBS@\
@LIBGCRYPT_LIBS@ @OPENSSL_LIBS@ @XML_LIBS@ @LIBARES_LIBS@\ @LIBGCRYPT_LIBS@ @OPENSSL_LIBS@ @XML_LIBS@ @LIBARES_LIBS@\
@LIBCARES_LIBS@ @LIBCARES_LIBS@
aria2c_LDFLAGS = -pg #aria2c_LDFLAGS = -pg
AM_CPPFLAGS = -Wall\ AM_CPPFLAGS = -Wall\
-I../lib -I../intl -I$(top_srcdir)/intl\ -I../lib -I../intl -I$(top_srcdir)/intl\
@LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@\ @LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@\
@LIBARES_CPPFLAGS@ @LIBCARES_CPPFLAGS@\ @LIBARES_CPPFLAGS@ @LIBCARES_CPPFLAGS@\
-D_FILE_OFFSET_BITS=64 -DLOCALEDIR=\"$(localedir)\" @DEFS@ -pg -D_FILE_OFFSET_BITS=64 -DLOCALEDIR=\"$(localedir)\" @DEFS@ # -pg
all: all-am all: all-am

View File

@ -98,7 +98,7 @@ bool PeerListenCommand::execute() {
} }
} }
} catch(RecoverableException* ex) { } catch(RecoverableException* ex) {
logger->error("CUID#%d - error in accepting connection", ex, cuid); logger->debug("CUID#%d - error in accepting connection", ex, cuid);
delete ex; delete ex;
} }
} }

View File

@ -49,8 +49,8 @@ void TorrentConsoleDownloadEngine::sendStatistics() {
printf("Download Completed."); printf("Download Completed.");
} else { } else {
printf("%s/%sB %d%% %s D:%.2f", printf("%s/%sB %d%% %s D:%.2f",
Util::llitos(downloadLength, true).c_str(), Util::abbrevSize(downloadLength).c_str(),
Util::llitos(totalLength, true).c_str(), Util::abbrevSizellitos(totalLength).c_str(),
(totalLength == 0 ? (totalLength == 0 ?
0 : (int)((downloadLength*100)/totalLength)), 0 : (int)((downloadLength*100)/totalLength)),
avgSpeed == 0 ? "-" : Util::secfmt(eta).c_str(), avgSpeed == 0 ? "-" : Util::secfmt(eta).c_str(),

View File

@ -40,6 +40,5 @@ SegmentManHandle TrackerSegmentManFactory::createNewInstance()
SegmentManHandle segmentMan = new SegmentMan(); SegmentManHandle segmentMan = new SegmentMan();
segmentMan->diskWriter = new ByteArrayDiskWriter(); segmentMan->diskWriter = new ByteArrayDiskWriter();
segmentMan->option = _option; segmentMan->option = _option;
segmentMan->ufilename = "[tracker.announce]";
return segmentMan; return segmentMan;
} }

View File

@ -88,6 +88,7 @@ Command* TrackerWatcherCommand::createCommand() {
Command* TrackerWatcherCommand::createRequestCommand(const string& url) Command* TrackerWatcherCommand::createRequestCommand(const string& url)
{ {
RequestGroupHandle rg = new RequestGroup(url, e->option); RequestGroupHandle rg = new RequestGroup(url, e->option);
rg->setUserDefinedFilename("[tracker.announce]");
rg->isTorrent = true; rg->isTorrent = true;
rg->setSegmentManFactory(new TrackerSegmentManFactory(e->option)); rg->setSegmentManFactory(new TrackerSegmentManFactory(e->option));
e->_requestGroupMan->addRequestGroup(rg); e->_requestGroupMan->addRequestGroup(rg);