diff options
Diffstat (limited to 'src/qmmpui')
| -rw-r--r-- | src/qmmpui/fileloader.cpp | 26 | ||||
| -rw-r--r-- | src/qmmpui/playlistparser.cpp | 17 |
2 files changed, 10 insertions, 33 deletions
diff --git a/src/qmmpui/fileloader.cpp b/src/qmmpui/fileloader.cpp index 55d3ee3c5..11f682b83 100644 --- a/src/qmmpui/fileloader.cpp +++ b/src/qmmpui/fileloader.cpp @@ -18,11 +18,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <qmmp/metadatamanager.h> -#include <QRegExp> +#include <QRegularExpression> #include <QMetaType> #include <QDir> #include <QApplication> +#include <qmmp/metadatamanager.h> #include "fileloader_p.h" #include "qmmpuisettings.h" #include "playlistitem.h" @@ -128,9 +128,9 @@ void FileLoader::insertPlayList(const QString &path, PlayListItem *before) { QStringList protocols = MetaDataManager::instance()->protocols(); QList<QRegularExpression> regExps = MetaDataManager::instance()->regExps(); - QList<QRegExp> filters; + QList<QRegularExpression> filters; for(const QString &pattern : MetaDataManager::instance()->nameFilters()) - filters << QRegExp(pattern, Qt::CaseInsensitive, QRegExp::Wildcard); + filters << QRegularExpression(QRegularExpression::wildcardToRegularExpression(pattern), QRegularExpression::CaseInsensitiveOption); QList<PlayListTrack *>::iterator it = tracks.begin(); @@ -146,7 +146,7 @@ void FileLoader::insertPlayList(const QString &path, PlayListItem *before) continue; } } - else if(!QFile::exists((*it)->path()) || !MetaDataManager::hasMatch(filters, (*it)->path())) + else if(!QFile::exists((*it)->path()) || !MetaDataManager::hasMatch(filters, (*it)->path().section(QChar('/'), -1))) { delete (*it); it = tracks.erase(it); @@ -346,13 +346,7 @@ bool FileLoader::checkRestrictFilters(const QFileInfo &info) if(m_settings->restrictFilters().isEmpty()) return true; - for(const QString &filter : m_settings->restrictFilters()) - { - QRegExp regexp (filter, Qt::CaseInsensitive, QRegExp::Wildcard); - if(regexp.exactMatch(info.absoluteFilePath())) - return true; - } - return false; + return QDir::match(m_settings->restrictFilters(), info.fileName()); } bool FileLoader::checkExcludeFilters(const QFileInfo &info) @@ -360,13 +354,7 @@ bool FileLoader::checkExcludeFilters(const QFileInfo &info) if(m_settings->excludeFilters().isEmpty()) return true; - for(const QString &filter : m_settings->excludeFilters()) - { - QRegExp regexp (filter, Qt::CaseInsensitive, QRegExp::Wildcard); - if(regexp.exactMatch(info.absoluteFilePath())) - return false; - } - return true; + return !QDir::match(m_settings->excludeFilters() , info.fileName()); } void FileLoader::removeIgnoredTracks(QList<PlayListTrack *> *tracks, const QStringList &ignoredPaths) diff --git a/src/qmmpui/playlistparser.cpp b/src/qmmpui/playlistparser.cpp index 2aac76bda..e1fdc1756 100644 --- a/src/qmmpui/playlistparser.cpp +++ b/src/qmmpui/playlistparser.cpp @@ -19,7 +19,6 @@ ***************************************************************************/ #include <QPluginLoader> -#include <QRegExp> #include <QList> #include <QDir> #include <QApplication> @@ -61,13 +60,7 @@ QStringList PlayListParser::filters() bool PlayListParser::isPlayList(const QString &url) { - for(const QString &filter : nameFilters()) - { - QRegExp r(filter, Qt::CaseInsensitive, QRegExp::Wildcard); - if(r.exactMatch(url)) - return true; - } - return false; + return QDir::match(nameFilters(), url.section(QChar('/'), -1)); } PlayListFormat *PlayListParser::findByMime(const QString &mime) @@ -83,12 +76,8 @@ PlayListFormat *PlayListParser::findByPath(const QString &filePath) loadFormats(); for(PlayListFormat *format : qAsConst(*m_formats)) { - for(const QString &filter : format->properties().filters) - { - QRegExp r(filter, Qt::CaseInsensitive, QRegExp::Wildcard); - if(r.exactMatch(filePath)) - return format; - } + if(QDir::match(format->properties().filters, filePath.section(QChar('/'), -1))) + return format; } return nullptr; } |