Import project: Speed up if --file-filter has been provided

danmar · danmar · commit e448cc68b52d · 2020-05-24T21:23:49.000+02:00
diff --git a/lib/importproject.cpp b/lib/importproject.cpp
@@ -200,11 +200,11 @@ ImportProject::Type ImportProject::import(const std::string &filename, Settings
         importCompileCommands(fin);
         return ImportProject::Type::COMPILE_DB;
     } else if (endsWith(filename, ".sln", 4)) {
-        importSln(fin,mPath);
+        importSln(fin, mPath, settings->fileFilter);
         return ImportProject::Type::VS_SLN;
     } else if (endsWith(filename, ".vcxproj", 8)) {
         std::map<std::string, std::string, cppcheck::stricmp> variables;
-        importVcxproj(filename, variables, emptyString);
+        importVcxproj(filename, variables, emptyString, settings->fileFilter);
         return ImportProject::Type::VS_VCXPROJ;
     } else if (endsWith(filename, ".bpr", 4)) {
         importBcb6Prj(filename);
@@ -401,7 +401,7 @@ void ImportProject::importCompileCommands(std::istream &istr)
     }
 }
 
-void ImportProject::importSln(std::istream &istr, const std::string &path)
+void ImportProject::importSln(std::istream &istr, const std::string &path, const std::string &fileFilter)
 {
     std::map<std::string,std::string,cppcheck::stricmp> variables;
     variables["SolutionDir"] = path;
@@ -419,7 +419,7 @@ void ImportProject::importSln(std::istream &istr, const std::string &path)
         std::string vcxproj(line.substr(pos1+1, pos-pos1+7));
         if (!Path::isAbsolute(vcxproj))
             vcxproj = path + vcxproj;
-        importVcxproj(Path::fromNativeSeparators(vcxproj), variables, emptyString);
+        importVcxproj(Path::fromNativeSeparators(vcxproj), variables, emptyString, fileFilter);
     }
 }
 
@@ -602,7 +602,7 @@ static void loadVisualStudioProperties(const std::string &props, std::map<std::s
     }
 }
 
-void ImportProject::importVcxproj(const std::string &filename, std::map<std::string, std::string, cppcheck::stricmp> &variables, const std::string &additionalIncludeDirectories)
+void ImportProject::importVcxproj(const std::string &filename, std::map<std::string, std::string, cppcheck::stricmp> &variables, const std::string &additionalIncludeDirectories, const std::string &fileFilter)
 {
     variables["ProjectDir"] = Path::simplifyPath(Path::getPathFromFilename(filename));
 
@@ -661,6 +661,10 @@ void ImportProject::importVcxproj(const std::string &filename, std::map<std::str
     }
 
     for (const std::string &c : compileList) {
+        const std::string cfilename = Path::simplifyPath(Path::isAbsolute(c) ? c : Path::getPathFromFilename(filename) + c);
+        if (!fileFilter.empty() && !matchglob(fileFilter, cfilename))
+            continue;
+
         for (const ProjectConfiguration &p : projectConfigurationList) {
 
             if (!guiProject.checkVsConfigs.empty()) {
@@ -675,7 +679,7 @@ void ImportProject::importVcxproj(const std::string &filename, std::map<std::str
             }
 
             FileSettings fs;
-            fs.filename = Path::simplifyPath(Path::isAbsolute(c) ? c : Path::getPathFromFilename(filename) + c);
+            fs.filename = cfilename;
             fs.cfg = p.name;
             fs.msc = true;
             fs.useMfc = useOfMfc;
diff --git a/lib/importproject.h b/lib/importproject.h
@@ -109,8 +109,8 @@ class CPPCHECKLIB ImportProject {
     void importCompileCommands(std::istream &istr);
     bool importCppcheckGuiProject(std::istream &istr, Settings *settings);
 private:
-    void importSln(std::istream &istr, const std::string &path);
-    void importVcxproj(const std::string &filename, std::map<std::string, std::string, cppcheck::stricmp> &variables, const std::string &additionalIncludeDirectories);
+    void importSln(std::istream &istr, const std::string &path, const std::string &fileFilter);
+    void importVcxproj(const std::string &filename, std::map<std::string, std::string, cppcheck::stricmp> &variables, const std::string &additionalIncludeDirectories, const std::string &fileFilter);
     void importBcb6Prj(const std::string &projectFilename);
 
     std::string mPath;

Original file line number	Diff line number	Diff line change
`@@ -200,11 +200,11 @@ ImportProject::Type ImportProject::import(const std::string &filename, Settings`
`200`	`200`	`importCompileCommands(fin);`
`201`	`201`	`return ImportProject::Type::COMPILE_DB;`
`202`	`202`	`} else if (endsWith(filename, ".sln", 4)) {`
`203`		`- importSln(fin,mPath);`
	`203`	`+ importSln(fin, mPath, settings->fileFilter);`
`204`	`204`	`return ImportProject::Type::VS_SLN;`
`205`	`205`	`} else if (endsWith(filename, ".vcxproj", 8)) {`
`206`	`206`	`std::map<std::string, std::string, cppcheck::stricmp> variables;`
`207`		`- importVcxproj(filename, variables, emptyString);`
	`207`	`+ importVcxproj(filename, variables, emptyString, settings->fileFilter);`
`208`	`208`	`return ImportProject::Type::VS_VCXPROJ;`
`209`	`209`	`} else if (endsWith(filename, ".bpr", 4)) {`
`210`	`210`	`importBcb6Prj(filename);`
`@@ -401,7 +401,7 @@ void ImportProject::importCompileCommands(std::istream &istr)`
`401`	`401`	`}`
`402`	`402`	`}`
`403`	`403`
`404`		`-void ImportProject::importSln(std::istream &istr, const std::string &path)`
	`404`	`+void ImportProject::importSln(std::istream &istr, const std::string &path, const std::string &fileFilter)`
`405`	`405`	`{`
`406`	`406`	`std::map<std::string,std::string,cppcheck::stricmp> variables;`
`407`	`407`	`variables["SolutionDir"] = path;`
`@@ -419,7 +419,7 @@ void ImportProject::importSln(std::istream &istr, const std::string &path)`
`419`	`419`	`std::string vcxproj(line.substr(pos1+1, pos-pos1+7));`
`420`	`420`	`if (!Path::isAbsolute(vcxproj))`
`421`	`421`	`vcxproj = path + vcxproj;`
`422`		`- importVcxproj(Path::fromNativeSeparators(vcxproj), variables, emptyString);`
	`422`	`+ importVcxproj(Path::fromNativeSeparators(vcxproj), variables, emptyString, fileFilter);`
`423`	`423`	`}`
`424`	`424`	`}`
`425`	`425`
`@@ -602,7 +602,7 @@ static void loadVisualStudioProperties(const std::string &props, std::map<std::s`
`602`	`602`	`}`
`603`	`603`	`}`
`604`	`604`
`605`		`-void ImportProject::importVcxproj(const std::string &filename, std::map<std::string, std::string, cppcheck::stricmp> &variables, const std::string &additionalIncludeDirectories)`
	`605`	`+void ImportProject::importVcxproj(const std::string &filename, std::map<std::string, std::string, cppcheck::stricmp> &variables, const std::string &additionalIncludeDirectories, const std::string &fileFilter)`
`606`	`606`	`{`
`607`	`607`	`variables["ProjectDir"] = Path::simplifyPath(Path::getPathFromFilename(filename));`
`608`	`608`
`@@ -661,6 +661,10 @@ void ImportProject::importVcxproj(const std::string &filename, std::map<std::str`
`661`	`661`	`}`
`662`	`662`
`663`	`663`	`for (const std::string &c : compileList) {`
	`664`	`+ const std::string cfilename = Path::simplifyPath(Path::isAbsolute(c) ? c : Path::getPathFromFilename(filename) + c);`
	`665`	`+ if (!fileFilter.empty() && !matchglob(fileFilter, cfilename))`
	`666`	`+ continue;`
	`667`	`+`
`664`	`668`	`for (const ProjectConfiguration &p : projectConfigurationList) {`
`665`	`669`
`666`	`670`	`if (!guiProject.checkVsConfigs.empty()) {`
`@@ -675,7 +679,7 @@ void ImportProject::importVcxproj(const std::string &filename, std::map<std::str`
`675`	`679`	`}`
`676`	`680`
`677`	`681`	`FileSettings fs;`
`678`		`- fs.filename = Path::simplifyPath(Path::isAbsolute(c) ? c : Path::getPathFromFilename(filename) + c);`
	`682`	`+ fs.filename = cfilename;`
`679`	`683`	`fs.cfg = p.name;`
`680`	`684`	`fs.msc = true;`
`681`	`685`	`fs.useMfc = useOfMfc;`