Commit 7b3f89ed authored by Frerich Raabe's avatar Frerich Raabe

- Be a bit more relaxed when matching filenames. I doubt this fixes Scott's

  problem but it surely fixes some of mine.

svn path=/trunk/kdemultimedia/juk/; revision=216881
parent bcdd759e
...@@ -97,9 +97,9 @@ QString FileNameScheme::composeRegExp(const QString &s) const ...@@ -97,9 +97,9 @@ QString FileNameScheme::composeRegExp(const QString &s) const
{ {
KConfigGroupSaver(cfg, "TagGuesser"); KConfigGroupSaver(cfg, "TagGuesser");
substitutions[ 't' ] = cfg->readEntry("Title regexp", "([\\w\\s']+)"); substitutions[ 't' ] = cfg->readEntry("Title regexp", "([\\w\\s'&]+)");
substitutions[ 'a' ] = cfg->readEntry("Artist regexp", "([\\w\\s]+)"); substitutions[ 'a' ] = cfg->readEntry("Artist regexp", "([\\w\\s'&]+)");
substitutions[ 'A' ] = cfg->readEntry("Album regexp", "([\\w\\s]+)"); substitutions[ 'A' ] = cfg->readEntry("Album regexp", "([\\w\\s'&]+)");
substitutions[ 'T' ] = cfg->readEntry("Track regexp", "(\\d+)"); substitutions[ 'T' ] = cfg->readEntry("Track regexp", "(\\d+)");
substitutions[ 'c' ] = cfg->readEntry("Comment regexp", "([\\w\\s]+)"); substitutions[ 'c' ] = cfg->readEntry("Comment regexp", "([\\w\\s]+)");
} }
...@@ -115,7 +115,7 @@ QString FileNameScheme::composeRegExp(const QString &s) const ...@@ -115,7 +115,7 @@ QString FileNameScheme::composeRegExp(const QString &s) const
for (; it != end; ++it) for (; it != end; ++it)
regExp.replace("%" + QString(it.key()), it.data()); regExp.replace("%" + QString(it.key()), it.data());
#endif #endif
regExp += "\\.[^\\.]+"; regExp += "\\.*";
return regExp; return regExp;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment