AdvancedDetector: Add new parameter directoryGlobs.

Without this parameter mass detection gave tons of false alarms.
Use globbing for narrowing down the depth search.

svn-id: r49788

engines/advancedDetector.cpp

@@ -341,7 +341,7 @@ static void reportUnknown(const Common::FSNode &path, const SizeMD5Map &filesSiz
 
 static ADGameDescList detectGameFilebased(const FileMap &allFiles, const ADParams &params);
 
-static void composeFileHashMap(const Common::FSList &fslist, FileMap &allFiles, int depth) {
+static void composeFileHashMap(const Common::FSList &fslist, FileMap &allFiles, int depth, const char **directoryGlobs) {
 	if (depth <= 0)
 		return;
 
@@ -354,10 +354,23 @@ static void composeFileHashMap(const Common::FSList &fslist, FileMap &allFiles,
 		if (file->isDirectory()) {
 			Common::FSList files;
 
+			if (!directoryGlobs)
+				continue;
+
+			bool matched = false;
+			for (const char *glob = *directoryGlobs; *glob; glob++)
+				if (file->getName().matchString(glob, true)) {
+					matched = true;
+					break;
+				}
+					
+			if (!matched)
+				continue;
+
 			if (!file->getChildren(files, Common::FSNode::kListAll))
 				continue;
 
-			composeFileHashMap(files, allFiles, depth - 1);
+			composeFileHashMap(files, allFiles, depth - 1, directoryGlobs);
 		}
 
 		Common::String tstr = file->getName();
@@ -385,7 +398,7 @@ static ADGameDescList detectGame(const Common::FSList &fslist, const ADParams &p
 
 	// First we compose a hashmap of all files in fslist.
 	// Includes nifty stuff like removing trailing dots and ignoring case.
-	composeFileHashMap(fslist, allFiles, (params.depth == 0 ? 1 : params.depth));
+	composeFileHashMap(fslist, allFiles, (params.depth == 0 ? 1 : params.depth), params.directoryGlobs);
 
 	// Check which files are included in some ADGameDescription *and* present
 	// in fslist. Compute MD5s and file sizes for these files.

engines/advancedDetector.h

@@ -192,11 +192,19 @@ struct ADParams {
 	uint32 guioptions;
 
 	/**
-	 *
 	 * Maximum depth of directories to look up
 	 * If set to 0, the depth is 1 level
 	 */
 	uint32 depth;
+
+	/**
+	 * Case-insensitive list of directory globs which could be used for
+	 * going deeper int directory structure.
+	 * @see String::matchString() method for format description.
+	 *
+	 * @note Last item must be 0
+	 */
+	const char **directoryGlobs;
 };
 
 

engines/agi/detection.cpp

@@ -147,7 +147,9 @@ static const ADParams detectionParams = {
 	// Additional GUI options (for every game}
 	Common::GUIO_NOSPEECH,
 	// Maximum directory depth
-	1
+	1,
+	// List of directory globs
+	0
 };
 
 using namespace Agi;

engines/agos/detection.cpp

@@ -104,7 +104,9 @@ static const ADParams detectionParams = {
 	// Additional GUI options (for every game}
 	Common::GUIO_NOLAUNCHLOAD,
 	// Maximum directory depth
-	2
+	2,
+	// List of directory globs
+	0
 };
 
 using namespace AGOS;

engines/cine/detection.cpp

@@ -82,7 +82,9 @@ static const ADParams detectionParams = {
 	// Additional GUI options (for every game}
 	Common::GUIO_NOSPEECH | Common::GUIO_NOMIDI,
 	// Maximum directory depth
-	1
+	1,
+	// List of directory globs
+	0
 };
 
 class CineMetaEngine : public AdvancedMetaEngine {

engines/cruise/detection.cpp

@@ -239,7 +239,9 @@ static const ADParams detectionParams = {
 	// Additional GUI options (for every game}
 	Common::GUIO_NOSPEECH | Common::GUIO_NOMIDI,
 	// Maximum directory depth
-	1
+	1,
+	// List of directory globs
+	0
 };
 
 class CruiseMetaEngine : public AdvancedMetaEngine {

engines/draci/detection.cpp

@@ -96,7 +96,9 @@ const ADParams detectionParams = {
 	// Global GUI options
 	Common::GUIO_NONE,
 	// Maximum directory depth
-	1
+	1,
+	// List of directory globs
+	0
 };
 
 class DraciMetaEngine : public AdvancedMetaEngine {

engines/drascula/detection.cpp

@@ -266,7 +266,9 @@ static const ADParams detectionParams = {
 	// Additional GUI options (for every game}
 	Common::GUIO_NOMIDI,
 	// Maximum directory depth
-	1
+	1,
+	// List of directory globs
+	0
 };
 
 class DrasculaMetaEngine : public AdvancedMetaEngine {

engines/gob/detection.cpp

@@ -109,7 +109,9 @@ static const ADParams detectionParams = {
 	// Additional GUI options (for every game}
 	Common::GUIO_NOLAUNCHLOAD,
 	// Maximum directory depth
-	1
+	1,
+	// List of directory globs
+	0
 };
 
 class GobMetaEngine : public AdvancedMetaEngine {

engines/groovie/detection.cpp

@@ -178,7 +178,9 @@ static const ADParams detectionParams = {
 	// Additional GUI options (for every game}
 	Common::GUIO_NOSUBTITLES | Common::GUIO_NOSFX,
 	// Maximum directory depth
-	1
+	1,
+	// List of directory globs
+	0
 };
 
 

engines/kyra/detection.cpp

@@ -63,7 +63,9 @@ const ADParams detectionParams = {
 	// Additional GUI options (for every game}
 	Common::GUIO_NONE,
 	// Maximum directory depth
-	1
+	1,
+	// List of directory globs
+	0
 };
 
 class KyraMetaEngine : public AdvancedMetaEngine {

engines/lure/detection.cpp

@@ -198,7 +198,9 @@ static const ADParams detectionParams = {
 	// Additional GUI options (for every game}
 	Common::GUIO_NOSPEECH,
 	// Maximum directory depth
-	1
+	1,
+	// List of directory globs
+	0
 };
 
 class LureMetaEngine : public AdvancedMetaEngine {

engines/m4/detection.cpp

@@ -402,7 +402,9 @@ static const ADParams detectionParams = {
 	// Additional GUI options (for every game}
 	Common::GUIO_NOMIDI,
 	// Maximum directory depth
-	1
+	1,
+	// List of directory globs
+	0
 };
 
 class M4MetaEngine : public AdvancedMetaEngine {

engines/made/detection.cpp

@@ -495,7 +495,9 @@ static const ADParams detectionParams = {
 	// Additional GUI options (for every game}
 	Common::GUIO_NONE,
 	// Maximum directory depth
-	1
+	1,
+	// List of directory globs
+	0
 };
 
 class MadeMetaEngine : public AdvancedMetaEngine {

engines/mohawk/detection.cpp

@@ -143,7 +143,9 @@ static const ADParams detectionParams = {
 	// Additional GUI options (for every game)
 	Common::GUIO_NONE,
 	// Maximum directory depth
-	2
+	2,
+	// List of directory globs
+	0
 };
 
 class MohawkMetaEngine : public AdvancedMetaEngine {

engines/parallaction/detection.cpp

@@ -242,7 +242,9 @@ static const ADParams detectionParams = {
 	// Additional GUI options (for every game}
 	Common::GUIO_NOLAUNCHLOAD,
 	// Maximum directory depth
-	1
+	1,
+	// List of directory globs
+	0
 };
 
 class ParallactionMetaEngine : public AdvancedMetaEngine {

engines/saga/detection.cpp

@@ -124,7 +124,9 @@ static const ADParams detectionParams = {
 	// Additional GUI options (for every game}
 	Common::GUIO_NONE,
 	// Maximum directory depth
-	1
+	1,
+	// List of directory globs
+	0
 };
 
 class SagaMetaEngine : public AdvancedMetaEngine {

engines/sci/detection.cpp

@@ -312,7 +312,9 @@ static const ADParams detectionParams = {
 	// Additional GUI options (for every game}
 	Common::GUIO_NONE,
 	// Maximum directory depth
-	1
+	1,
+	// List of directory globs
+	0
 };
 
 class SciMetaEngine : public AdvancedMetaEngine {

engines/teenagent/detection.cpp

@@ -92,7 +92,8 @@ static const ADParams detectionParams = {
 	0,
 	0,
 	Common::GUIO_NONE,
-	1
+	1,
+	0
 };
 
 #define MAX_SAVES 20

engines/tinsel/detection.cpp

@@ -97,7 +97,9 @@ static const ADParams detectionParams = {
 	// Additional GUI options (for every game}
 	Common::GUIO_NONE,
 	// Maximum directory depth
-	1
+	1,
+	// List of directory globs
+	0
 };
 
 class TinselMetaEngine : public AdvancedMetaEngine {

engines/touche/detection.cpp

@@ -136,7 +136,9 @@ static const ADParams detectionParams = {
 	// Additional GUI options (for every game}
 	Common::GUIO_NONE,
 	// Maximum directory depth
-	1
+	1,
+	// List of directory globs
+	0
 };
 
 class ToucheMetaEngine : public AdvancedMetaEngine {

engines/tucker/detection.cpp

@@ -115,7 +115,8 @@ static const ADParams detectionParams = {
 	0,
 	0,
 	Common::GUIO_NONE,
-	1
+	1,
+	0
 };
 
 static const ADGameDescription tuckerDemoGameDescription = {