iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

When searching, search both with and without diaeresis, etc. e.g. both Queensrÿche and Queensryche should match.

Browse Source
This commit is contained in:
craig.p.drummond
2014-04-04 19:37:47 +00:00
committed by craig.p.drummond
parent a1015a591e
commit fb1a8b9064
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
models/proxymodel.cpp
View File

@@ -22,6 +22,10 @@
*/
#include "proxymodel.h"
#include <QMap>
#include <QString>
#include <QLatin1String>
#include <QChar>
bool ProxyModel::matchesFilter(const Song &s) const
{
@@ -47,21 +51,34 @@ bool ProxyModel::matchesFilter(const QStringList &strings) const
uint ums = unmatchedStrings;
int numStrings = filterStrings.count();
foreach (const QString &candidate /*str*/, strings) {
// QString candidate = str.simplified();
// for (int i = 0; i < candidate.size(); ++i) {
// if (candidate.at(i).decompositionTag() != QChar::NoDecomposition) {
// candidate[i] = candidate[i].decomposition().at(0);
// }
// }
foreach (const QString &str, strings) {
QString candidate = str.simplified();
QString basic;
for (int i = 0; i < numStrings; ++i) {
if (candidate.contains(filterStrings.at(i), Qt::CaseInsensitive)) {
const QString &f=filterStrings.at(i);
// Try to match string as entered by user...
if (candidate.contains(f, Qt::CaseInsensitive)) {
ums &= ~(1<<i);
if (0==ums) {
return true;
}
} else {
// Try converting string to basic - e.g. remove umlauts, etc...
if (basic.isEmpty()) {
basic = candidate;
for (int i = 0; i < basic.size(); ++i) {
if (basic.at(i).decompositionTag() != QChar::NoDecomposition) {
basic[i] = basic[i].decomposition().at(0);
}
}
}
if (basic.contains(f, Qt::CaseInsensitive)) {
ums &= ~(1<<i);
if (0==ums) {
return true;
}
}
}
}
}