linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2180
committer: poy <poy@xxxxxxxxxx>
branch nick: repo
timestamp: Sat 2010-07-10 16:54:01 +0200
message:
  simplify the default search type list creation
modified:
  dcpp/SettingsManager.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/SettingsManager.cpp'
--- dcpp/SettingsManager.cpp	2010-07-03 08:37:49 +0000
+++ dcpp/SettingsManager.cpp	2010-07-10 14:54:01 +0000
@@ -536,58 +536,34 @@
 void SettingsManager::setSearchTypeDefaults() {
 	searchTypes.clear();
 
-	// @todo simplify this as searchTypes['0' + SearchManager::TYPE_AUDIO] = { "mp3", "etc" } when we'll have C++0x
-
-	// @todo the default extension list contains some depreciated formats they kept to get all the NMDC-built subset of results for both type 
-	// of hubs. Some of these may worth to be dropped along with NMDC support...
-
-	{
-		StringList& l = searchTypes.insert(make_pair(string(1, '0' + SearchManager::TYPE_AUDIO), StringList())).first->second;
-		l.push_back("mp3"); l.push_back("flac"); l.push_back("ogg"); l.push_back("mpc");
-		l.push_back("ape"); l.push_back("wma");l.push_back("wav"); l.push_back("m4a");
-		l.push_back("mp2"); l.push_back("mid"); l.push_back("au"); l.push_back("aiff");
-		l.push_back("ra");
-	}
-
-	{
-		StringList& l = searchTypes.insert(make_pair(string(1, '0' + SearchManager::TYPE_COMPRESSED), StringList())).first->second;
-		l.push_back("rar"); l.push_back("7z"); l.push_back("zip"); l.push_back("tar");
-		l.push_back("gz"); l.push_back("bz2"); l.push_back("z"); l.push_back("ace");
-		l.push_back("lha"); l.push_back("lzh"); l.push_back("arj");
-	}
-
-	{
-		StringList& l = searchTypes.insert(make_pair(string(1, '0' + SearchManager::TYPE_DOCUMENT), StringList())).first->second;
-		l.push_back("doc"); l.push_back("xls"); l.push_back("ppt"); l.push_back("docx");
-		l.push_back("xlsx"); l.push_back("pptx"); l.push_back("odf"); l.push_back("odt");
-		l.push_back("ods"); l.push_back("odp"); l.push_back("pdf"); l.push_back("xps");
-		l.push_back("htm"); l.push_back("html"); l.push_back("xml"); l.push_back("txt");
-		l.push_back("nfo"); l.push_back("rtf");
-	}
-
-	{
-		StringList& l = searchTypes.insert(make_pair(string(1, '0' + SearchManager::TYPE_EXECUTABLE), StringList())).first->second;
-		l.push_back("exe"); l.push_back("com"); l.push_back("bat"); l.push_back("cmd");
-		l.push_back("dll"); l.push_back("vbs"); l.push_back("ps1"); l.push_back("msi");
-	}
-
-	{
-		StringList& l = searchTypes.insert(make_pair(string(1, '0' + SearchManager::TYPE_PICTURE), StringList())).first->second;
-		l.push_back("bmp"); l.push_back("ico"); l.push_back("jpg"); l.push_back("jpeg");
-		l.push_back("png"); l.push_back("gif"); l.push_back("tga"); l.push_back("ai");
-		l.push_back("ps"); l.push_back("pict"); l.push_back("eps"); l.push_back("img");
-		l.push_back("pct"); l.push_back("psp"); l.push_back("tif"); l.push_back("rle");
-		l.push_back("pcx"); l.push_back("sfw"); l.push_back("psd"); l.push_back("cdr");
-	}
-
-	{
-		StringList& l = searchTypes.insert(make_pair(string(1, '0' + SearchManager::TYPE_VIDEO), StringList())).first->second;
-		l.push_back("mpg"); l.push_back("avi"); l.push_back("mkv"); l.push_back("wmv");
-		l.push_back("mov"); l.push_back("mp4"); l.push_back("3gp"); l.push_back("qt");
-		l.push_back("asx"); l.push_back("divx"); l.push_back("asf"); l.push_back("pxp");
-		l.push_back("ogm"); l.push_back("flv"); l.push_back("rm"); l.push_back("rmvb");
-		l.push_back("webm"); l.push_back("mpeg");
-	}
+	// @todo remove deprecated formats when NMDC support is out
+
+	searchTypes[string(1, '0' + SearchManager::TYPE_AUDIO)] = {
+		"mp3", "flac", "ogg", "mpc", "ape", "wma", "wav", "m4a", "mp2", "mid", "au", "aiff"
+	};
+
+	searchTypes[string(1, '0' + SearchManager::TYPE_COMPRESSED)] = {
+		"rar", "7z", "zip", "tar", "gz", "bz2", "z", "ace", "lha", "lzh", "arj"
+	};
+
+	searchTypes[string(1, '0' + SearchManager::TYPE_DOCUMENT)] = {
+		"doc", "xls", "ppt", "docx", "xlsx", "pptx", "odf", "odt", "ods", "odp", "pdf", "xps",
+		"htm", "html", "xml", "txt", "nfo", "rtf"
+	};
+
+	searchTypes[string(1, '0' + SearchManager::TYPE_EXECUTABLE)] = {
+		"exe", "com", "bat", "cmd", "dll", "vbs", "ps1", "msi"
+	};
+
+	searchTypes[string(1, '0' + SearchManager::TYPE_PICTURE)] = {
+		"bmp", "ico", "jpg", "jpeg", "png", "gif", "tga", "ai", "ps", "pict", "eps", "img", "pct",
+		"psp", "tif", "rle", "pcx", "sfw", "psd", "cdr"
+	};
+
+	searchTypes[string(1, '0' + SearchManager::TYPE_VIDEO)] = {
+		"mpg", "avi", "mkv", "wmv", "mov", "mp4", "3gp", "qt", "asx", "divx", "asf", "pxp", "ogm",
+		"flv", "rm", "rmvb", "webm", "mpeg"
+	};
 
 	fire(SettingsManagerListener::SearchTypesChanged());
 }