Commit e6dc7ead authored by Frerich Raabe's avatar Frerich Raabe

- Schemes which involve directory names should be checked last, they match

  so easily.

svn path=/trunk/kdemultimedia/juk/; revision=288280
parent 7bc3b275
......@@ -46,6 +46,7 @@ FileNameScheme::FileNameScheme(const QString &s)
bool FileNameScheme::matches(const QString &fileName) const
{
if ( m_regExp.exactMatch( fileName ) ) qDebug( "'%s' matches", m_regExp.pattern().latin1() );
return m_regExp.exactMatch(fileName);
}
......@@ -117,9 +118,6 @@ QStringList TagGuesser::schemeStrings()
schemes = cfg->readListEntry( "Filename schemes" );
}
if ( schemes.isEmpty() ) {
schemes += "%a/%A/[%T] %t [%c]";
schemes += "%a/%A/[%T] %t (%c)";
schemes += "%a/%A/[%T] %t";
schemes += "%a - (%T) - %t [%c]";
schemes += "%a - (%T) - %t (%c)";
schemes += "%a - (%T) - %t";
......@@ -144,6 +142,9 @@ QStringList TagGuesser::schemeStrings()
schemes += "%a - %t [%c]";
schemes += "%a - %t (%c)";
schemes += "%a - %t";
schemes += "%a/%A/[%T] %t [%c]";
schemes += "%a/%A/[%T] %t (%c)";
schemes += "%a/%A/[%T] %t";
}
return schemes;
}
......
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