linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2731
committer: iceman50 <bdcdevel@xxxxxxxxx>
branch nick: dcplusplus
timestamp: Sun 2011-12-18 11:34:49 -0600
message:
  change handling of partial filelists
modified:
  dcpp/Download.cpp
  dcpp/QueueManager.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'dcpp/Download.cpp'
--- dcpp/Download.cpp	2011-09-30 11:33:12 +0000
+++ dcpp/Download.cpp	2011-12-18 17:34:49 +0000
@@ -65,7 +65,7 @@
 	cmd.addParam(Transfer::names[getType()]);
 
 	if(getType() == TYPE_PARTIAL_LIST) {
-		cmd.addParam(Util::toAdcFile(getPath()));
+		cmd.addParam(Util::toAdcFile(getTempTarget()));
 	} else if(getType() == TYPE_FULL_LIST) {
 		if(isSet(Download::FLAG_XML_BZ_LIST)) {
 			cmd.addParam(USER_LIST_NAME_BZ);

=== modified file 'dcpp/QueueManager.cpp'
--- dcpp/QueueManager.cpp	2011-10-20 14:14:24 +0000
+++ dcpp/QueueManager.cpp	2011-12-18 17:34:49 +0000
@@ -930,7 +930,7 @@
 		}
 	}
 
-	Download* d = new Download(aSource, *q, q->isSet(QueueItem::FLAG_PARTIAL_LIST) ? q->getTempTarget() : q->getTarget(), supportsTrees);
+	Download* d = new Download(aSource, *q, q->getTarget(), supportsTrees);
 
 	userQueue.addDownload(q, d);
 
@@ -1090,7 +1090,7 @@
 		aDownload->setFile(0);
 
 		if(aDownload->getType() == Transfer::TYPE_PARTIAL_LIST) {
-			QueueItem* q = fileQueue.find(getListPath(aDownload->getHintedUser()));
+			QueueItem* q = fileQueue.find(aDownload->getPath());
 			if(q) {
 				if(finished) {
 					fire(QueueManagerListener::PartialList(), aDownload->getHintedUser(), aDownload->getPFS());