added URL checking by regexp

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9109 90c681e8-e032-0410-971d-27865f9a5e38

3 files changed, 18 insertions, 21 deletions

diff --git a/src/qmmpui/addurldialog.cpp b/src/qmmpui/addurldialog.cpp
index 91f12cf17..81ae1bf80 100644
--- a/src/qmmpui/addurldialog.cpp
+++ b/src/qmmpui/addurldialog.cpp
@@ -48,8 +48,11 @@ AddUrlDialog::AddUrlDialog(QWidget *parent) : QDialog(parent)
     if(QmmpUiSettings::instance()->useClipboard())
     {
         QUrl url(QApplication::clipboard()->text().trimmed());
-        if(url.isValid() && MetaDataManager::instance()->protocols().contains(url.scheme()))
+        if(url.isValid() && (MetaDataManager::instance()->protocols().contains(url.scheme()) ||
+                             MetaDataManager::hasMatch(MetaDataManager::instance()->regExps(), url.toString())))
+        {
             urlComboBox->setEditText(QApplication::clipboard()->text().trimmed());
+        }
     }
 }
 
diff --git a/src/qmmpui/fileloader.cpp b/src/qmmpui/fileloader.cpp
index a03bb18c7..ecd92dc19 100644
--- a/src/qmmpui/fileloader.cpp
+++ b/src/qmmpui/fileloader.cpp
@@ -127,6 +127,7 @@ void FileLoader::insertPlayList(const QString &path, PlayListItem *before)
     else
     {
         QStringList protocols = MetaDataManager::instance()->protocols();
+        QList<QRegularExpression> regExps =  MetaDataManager::instance()->regExps();
         QList<QRegExp> filters;
         for(const QString &pattern : MetaDataManager::instance()->nameFilters())
             filters << QRegExp(pattern, Qt::CaseInsensitive, QRegExp::Wildcard);
@@ -135,8 +136,11 @@ void FileLoader::insertPlayList(const QString &path, PlayListItem *before)
         QList<PlayListTrack *>::iterator it = tracks.begin();
         while(it != tracks.end())
         {
-            if((*it)->path().contains("://") && !protocols.contains((*it)->path().section("://", 0, 0)))
+            if((*it)->path().contains("://") &&
+                    !protocols.contains((*it)->path().section("://", 0, 0)) &&
+                    !MetaDataManager::hasMatch(regExps, (*it)->path()))
             {
+
                 delete (*it);
                 it = tracks.erase(it);
             }
@@ -145,26 +149,14 @@ void FileLoader::insertPlayList(const QString &path, PlayListItem *before)
                 delete (*it);
                 it = tracks.erase(it);
             }
+            else if(!MetaDataManager::hasMatch(filters, (*it)->path()))
+            {
+                delete (*it);
+                it = tracks.erase(it);
+            }
             else
             {
-                bool found = false;
-                for(const QRegExp &filter : qAsConst(filters))
-                {
-                    if(filter.exactMatch((*it)->path()))
-                    {
-                        found = true;
-                        break;
-                    }
-                }
-                if(!found)
-                {
-                    delete (*it);
-                    it = tracks.erase(it);
-                }
-                else
-                {
-                    ++it;
-                }
+                ++it;
             }
         }
         if(!m_finished && !tracks.isEmpty())
diff --git a/src/qmmpui/playlisttask.cpp b/src/qmmpui/playlisttask.cpp
index d326536f6..37b543b85 100644
--- a/src/qmmpui/playlisttask.cpp
+++ b/src/qmmpui/playlisttask.cpp
@@ -405,6 +405,8 @@ void PlayListTask::run()
     {
         TrackField *f = nullptr;
         MetaDataManager *mm = MetaDataManager::instance();
+        QStringList protocols = mm->protocols();
+        QList<QRegularExpression> regExps = mm->regExps();
         bool ok = false;
         //find invalid files
         for(int i = 0; i < m_fields.count(); ++i)
@@ -412,7 +414,7 @@ void PlayListTask::run()
             f = m_fields.at(i);
 
             if(f->value.contains("://"))
-                ok = mm->protocols().contains(f->value.section("://",0,0)); //url
+                ok = protocols.contains(f->value.section("://",0,0)) || MetaDataManager::hasMatch(regExps, f->value) ; //url
             else
                 ok = mm->supports(f->value); //local file