From 83c0b2c4ec4fe9e4bd80637e27f02701510a21fe Mon Sep 17 00:00:00 2001 From: shun_iwasawa Date: May 28 2019 04:28:11 +0000 Subject: handle name filters --- diff --git a/toonz/sources/common/tsystem/tsystem.cpp b/toonz/sources/common/tsystem/tsystem.cpp index c67c081..d6874b8 100644 --- a/toonz/sources/common/tsystem/tsystem.cpp +++ b/toonz/sources/common/tsystem/tsystem.cpp @@ -565,7 +565,22 @@ void TSystem::readDirectory(TFilePathSet &dst, const QDir &dir, WIN32_FIND_DATA find_dir_data; QString dir_search_path = dir.absolutePath() + "\\*"; QDir::Filters filter = dir.filter(); - auto addEntry = [&]() { + + // store name filters + bool hasNameFilter = false; + QList nameFilters; + for (const QString &nameFilter : dir.nameFilters()) { + if (nameFilter == "*") { + hasNameFilter = false; + break; + } + QRegExp regExp(nameFilter); + regExp.setPatternSyntax(QRegExp::Wildcard); + nameFilters.append(regExp); + hasNameFilter = true; + } + + auto addEntry = [&]() { // QDir::NoDotAndDotDot condition if (wcscmp(find_dir_data.cFileName, L".") != 0 && wcscmp(find_dir_data.cFileName, L"..") != 0) { @@ -581,7 +596,22 @@ void TSystem::readDirectory(TFilePathSet &dst, const QDir &dir, if ((filter & QDir::Hidden) == 0 && (find_dir_data.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)) return; - entries.append(QString::fromWCharArray(find_dir_data.cFileName)); + + QString fileName = QString::fromWCharArray(find_dir_data.cFileName); + + // name filter + if (hasNameFilter) { + bool matched = false; + for (const QRegExp ®Exp : nameFilters) { + if (regExp.exactMatch(fileName)) { + matched = true; + break; + } + } + if (!matched) return; + } + + entries.append(fileName); } }; HANDLE hFind =