linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2467
committer: bdcdevel <bdcdevel@xxxxxxxxx>
branch nick: dcplusplus
timestamp: Tue 2011-03-22 14:42:53 -0500
message:
  .DcLst remnant clean-up
modified:
  dcpp/DirectoryListing.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/DirectoryListing.cpp'
--- dcpp/DirectoryListing.cpp	2011-02-12 17:03:41 +0000
+++ dcpp/DirectoryListing.cpp	2011-03-22 19:42:53 +0000
@@ -50,15 +50,11 @@
 }
 
 UserPtr DirectoryListing::getUserFromFilename(const string& fileName) {
-	// General file list name format: [username].[CID].[xml|xml.bz2|DcLst]
+	// General file list name format: [username].[CID].[xml|xml.bz2]
 
 	string name = Util::getFileName(fileName);
 
 	// Strip off any extensions
-	if(Util::stricmp(name.c_str() + name.length() - 6, ".DcLst") == 0) {
-		name.erase(name.length() - 6);
-	}
-
 	if(Util::stricmp(name.c_str() + name.length() - 4, ".bz2") == 0) {
 		name.erase(name.length() - 4);
 	}

=== modified file 'dcpp/QueueManager.cpp'
--- dcpp/QueueManager.cpp	2011-03-10 20:27:58 +0000
+++ dcpp/QueueManager.cpp	2011-03-22 19:42:53 +0000
@@ -507,11 +507,6 @@
 		std::sort(filelists.begin(), filelists.end());
 		std::for_each(filelists.begin(), std::set_difference(filelists.begin(), filelists.end(),
 			protectedFileLists.begin(), protectedFileLists.end(), filelists.begin()), &File::deleteFile);
-
-		filelists = File::findFiles(path, "*.DcLst");
-		std::sort(filelists.begin(), filelists.end());
-		std::for_each(filelists.begin(), std::set_difference(filelists.begin(), filelists.end(),
-			protectedFileLists.begin(), protectedFileLists.end(), filelists.begin()), &File::deleteFile);
 	}
 }