Revert "Fix issue #1646, #1644: Filtering qualified files"

This reverts commit 96fd846ca51fc6b339ce27f89d59f547a691ca00.

diff --git a/Src/DirScan.cpp b/Src/DirScan.cpp
index 8b7fcca..2e71991 100644 (file)
--- a/Src/DirScan.cpp
+++ b/Src/DirScan.cpp
@@ -863,15 +863,9 @@ static void CompareDiffItem(FolderCmp &fc, DIFFITEM &di)
        {
                // 1. Test against filters
                if (pCtxt->m_piFilterGlobal==nullptr ||
-                       (nDirs == 2 && pCtxt->m_piFilterGlobal->includeFile(
-                               paths::ConcatPath(di.diffFileInfo[0].path, di.diffFileInfo[0].filename), 
-                               paths::ConcatPath(di.diffFileInfo[1].path, di.diffFileInfo[1].filename)
-                       )) ||
-                       (nDirs == 3 && pCtxt->m_piFilterGlobal->includeFile(
-                               paths::ConcatPath(di.diffFileInfo[0].path, di.diffFileInfo[0].filename),
-                               paths::ConcatPath(di.diffFileInfo[1].path, di.diffFileInfo[1].filename),
-                               paths::ConcatPath(di.diffFileInfo[2].path, di.diffFileInfo[2].filename)
-                       )))
+                       (nDirs == 2 && pCtxt->m_piFilterGlobal->includeFile(di.diffFileInfo[0].filename, di.diffFileInfo[1].filename)) ||
+                       (nDirs == 3 && pCtxt->m_piFilterGlobal->includeFile(di.diffFileInfo[0].filename, di.diffFileInfo[1].filename, di.diffFileInfo[2].filename))
+                       )
                {
                        di.diffcode.diffcode |= DIFFCODE::INCLUDED;
                        di.diffcode.diffcode |= fc.prepAndCompareFiles(di);

diff --git a/Src/FileFilter.h b/Src/FileFilter.h
index dca620d..3f9ea16 100644 (file)
--- a/Src/FileFilter.h
+++ b/Src/FileFilter.h
@@ -29,13 +29,10 @@ struct FileFilterElement
        Poco::RegularExpression regexp; /**< Compiled regular expression */
        std::string _regex; /**< Regular expression string to set to Poco::RegularExpression */
        int _reOpts; /**< Options to set to Poco::RegularExpression */
-       bool _fileNameOnly; /**< If true, indicates that the filter matches only filenames */
-       FileFilterElement(const std::string& regex, int reOpts, bool fileFilter) :
-               regexp(regex, reOpts), _regex(regex), _reOpts(reOpts), _fileNameOnly(fileFilter && regex.find("\\\\", 0) == String::npos)
+       FileFilterElement(const std::string& regex, int reOpts) : regexp(regex, reOpts), _regex(regex), _reOpts(reOpts)
        {
        }
-       FileFilterElement(const FileFilterElement* element) :
-               regexp(element->_regex, element->_reOpts), _regex(element->_regex), _reOpts(element->_reOpts), _fileNameOnly(element->_fileNameOnly)
+       FileFilterElement(const FileFilterElement* element) : regexp(element->_regex, element->_reOpts), _regex(element->_regex), _reOpts(element->_reOpts)
        {
        }
 };

diff --git a/Src/FileFilterMgr.cpp b/Src/FileFilterMgr.cpp
index c02aa92..4e81c75 100644 (file)
--- a/Src/FileFilterMgr.cpp
+++ b/Src/FileFilterMgr.cpp
@@ -23,7 +23,7 @@ using Poco::Glob;
 using Poco::icompare;
 using Poco::RegularExpression;
 
-static void AddFilterPattern(vector<FileFilterElementPtr> *filterList, String & str, bool fileFilter);
+static void AddFilterPattern(vector<FileFilterElementPtr> *filterList, String & str);
 
 /**
  * @brief Destructor, frees all filters.
@@ -119,7 +119,7 @@ void FileFilterMgr::DeleteAllFilters()
  * @param [in] filterList List where pattern is added.
  * @param [in] str Temporary variable (ie, it may be altered)
  */
-static void AddFilterPattern(vector<FileFilterElementPtr> *filterList, String & str, bool fileFilter)
+static void AddFilterPattern(vector<FileFilterElementPtr> *filterList, String & str)
 {
        const String& commentLeader = _T("##"); // Starts comment
        str = strutils::trim_ws_begin(str);
@@ -145,7 +145,7 @@ static void AddFilterPattern(vector<FileFilterElementPtr> *filterList, String &
        re_opts |= RegularExpression::RE_UTF8;
        try
        {
-               filterList->push_back(FileFilterElementPtr(new FileFilterElement(regexString, re_opts, fileFilter)));
+               filterList->push_back(FileFilterElementPtr(new FileFilterElement(regexString, re_opts)));
        }
        catch (...)
        {
@@ -218,25 +218,25 @@ FileFilter * FileFilterMgr::LoadFilterFile(const String& szFilepath, int & error
                {
                        // file filter
                        String str = sLine.substr(2);
-                       AddFilterPattern(&pfilter->filefilters, str, true);
+                       AddFilterPattern(&pfilter->filefilters, str);
                }
                else if (0 == sLine.compare(0, 2, _T("d:"), 2))
                {
                        // directory filter
                        String str = sLine.substr(2);
-                       AddFilterPattern(&pfilter->dirfilters, str, false);
+                       AddFilterPattern(&pfilter->dirfilters, str);
                }
                else if (0 == sLine.compare(0, 3, _T("f!:"), 3))
                {
                        // file filter
                        String str = sLine.substr(3);
-                       AddFilterPattern(&pfilter->filefiltersExclude, str, true);
+                       AddFilterPattern(&pfilter->filefiltersExclude, str);
                }
                else if (0 == sLine.compare(0, 3, _T("d!:"), 3))
                {
                        // directory filter
                        String str = sLine.substr(3);
-                       AddFilterPattern(&pfilter->dirfiltersExclude, str, false);
+                       AddFilterPattern(&pfilter->dirfiltersExclude, str);
                }
        } while (bLinesLeft);
 
@@ -289,7 +289,7 @@ bool TestAgainstRegList(const vector<FileFilterElementPtr> *filterList, const St
        if (filterList->size() == 0)
                return false;
 
-       std::string compString, compStringFileName;
+       std::string compString;
        ucr::toUTF8(szTest, compString);
        vector<FileFilterElementPtr>::const_iterator iter = filterList->begin();
        while (iter != filterList->end())
@@ -297,9 +297,7 @@ bool TestAgainstRegList(const vector<FileFilterElementPtr> *filterList, const St
                RegularExpression::Match match;
                try
                {
-                       if ((*iter)->_fileNameOnly && compStringFileName.empty())
-                               ucr::toUTF8(paths::FindFileName(szTest), compStringFileName);
-                       if ((*iter)->regexp.match((*iter)->_fileNameOnly ? compStringFileName : compString, 0, match) > 0)
+                       if ((*iter)->regexp.match(compString, 0, match) > 0)
                                return true;
                }
                catch (...)

diff --git a/Src/FolderCmp.cpp b/Src/FolderCmp.cpp
index 983b6b5..12e32c7 100644 (file)
--- a/Src/FolderCmp.cpp
+++ b/Src/FolderCmp.cpp
@@ -78,12 +78,9 @@ int FolderCmp::prepAndCompareFiles(DIFFITEM &di)
                        nCompMethod = CMP_BINARY_CONTENT;
                }
                else if (m_pCtxt->m_bEnableImageCompare && (
-                       di.diffFileInfo[0].size != DirItem::FILE_SIZE_NONE && m_pCtxt->m_pImgfileFilter->includeFile(
-                               paths::ConcatPath(di.diffFileInfo[0].path, di.diffFileInfo[0].filename)) ||
-                       di.diffFileInfo[1].size != DirItem::FILE_SIZE_NONE && m_pCtxt->m_pImgfileFilter->includeFile(
-                               paths::ConcatPath(di.diffFileInfo[1].path, di.diffFileInfo[1].filename)) ||
-                       nDirs > 2 && di.diffFileInfo[2].size != DirItem::FILE_SIZE_NONE && m_pCtxt->m_pImgfileFilter->includeFile(
-                               paths::ConcatPath(di.diffFileInfo[2].path, di.diffFileInfo[2].filename))))
+                       di.diffFileInfo[0].size != DirItem::FILE_SIZE_NONE && m_pCtxt->m_pImgfileFilter->includeFile(di.diffFileInfo[0].filename) ||
+                       di.diffFileInfo[1].size != DirItem::FILE_SIZE_NONE && m_pCtxt->m_pImgfileFilter->includeFile(di.diffFileInfo[1].filename) ||
+                       nDirs > 2 && di.diffFileInfo[2].size != DirItem::FILE_SIZE_NONE && m_pCtxt->m_pImgfileFilter->includeFile(di.diffFileInfo[2].filename)))
                {
                        nCompMethod = CMP_IMAGE_CONTENT;
                }

diff --git a/Src/Plugins.cpp b/Src/Plugins.cpp
index 8f1a375..28be9c9 100644 (file)
--- a/Src/Plugins.cpp
+++ b/Src/Plugins.cpp
@@ -246,7 +246,7 @@ void PluginInfo::LoadFilterString()
                re_opts |= RegularExpression::RE_UTF8;
                try
                {
-                       m_filters.emplace_back(std::make_shared<FileFilterElement>(regexString, re_opts, true));
+                       m_filters.emplace_back(std::make_shared<FileFilterElement>(regexString, re_opts));
                }
                catch (...)
                {