linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3367
committer: Fredrik Ullner <ullner@xxxxxxxxx>
branch nick: dcplusplus
timestamp: Mon 2013-11-18 23:11:26 +0100
message:
  Remove queued files that are already shared when DC++ starts
modified:
  changelog.txt
  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 'changelog.txt'
--- changelog.txt	2013-11-13 21:48:31 +0000
+++ changelog.txt	2013-11-18 22:11:26 +0000
@@ -1,6 +1,7 @@
 * [L#1115765] Added ability to filter out files and directories from the share (ullner)
 * [L#1225420] Open own list when using get/browse file list on self (ullner)
 * [L#1250614] Added menu option on hub tab for only searching in that hub (ullner)
+* [L#250238] Remove queued files that are already shared when DC++ starts (ullner)
 
 -- 0.831 2013-11-11 --
 * [L#1249810] Fix NMDC TTH search responses (emtee)

=== modified file 'dcpp/QueueManager.cpp'
--- dcpp/QueueManager.cpp	2013-11-13 21:45:15 +0000
+++ dcpp/QueueManager.cpp	2013-11-18 22:11:26 +0000
@@ -1488,6 +1488,14 @@
 			if (downloaded > size || downloaded < 0)
 				downloaded = 0;
 
+			if(SETTING(DONT_DL_ALREADY_SHARED)){
+				if (ShareManager::getInstance()->isTTHShared(TTHValue(tthRoot))){
+					LogManager::getInstance()->message(str(F_("The queued file %1% already exists in your share, removing from the queue") 
+						% Util::addBrackets(target)));
+					return;
+				}
+			}
+
 			if(added == 0)
 				added = GET_TIME();