Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2025-01-31 03:27:40 +01:00
Code Issues Releases Wiki Activity

Better unicode search.

Browse Source 
Fixes issue #419
This commit is contained in:
John Maguire 2010-06-18 12:54:11 +00:00
parent 9e81f5e72b
commit 82b728528e
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/database.cpp
View File

@ -105,7 +105,15 @@ bool Database::Like(const char* needle, const char* haystack) {
query_cache_ = QString::fromUtf8(needle).section('%', 1, 1).split(' ');
query_hash_ = hash;
}
// In place decompose string as it's faster :-)
QString b = QString::fromUtf8(haystack);
QChar* data = b.data();
for (int i = 0; i < b.length(); ++i) {
if (data[i].decompositionTag() != QChar::NoDecomposition) {
data[i] = data[i].decomposition()[0];
}
}
foreach (const QString& query, query_cache_) {
if (!b.contains(query, Qt::CaseInsensitive)) {
return false;

1
src/core/database.h
View File

@ -65,6 +65,7 @@ class Database : public QObject {
FRIEND_TEST(DatabaseTest, LikePerformance);
FRIEND_TEST(DatabaseTest, LikeCacheInvalidated);
FRIEND_TEST(DatabaseTest, LikeQuerySplit);
FRIEND_TEST(DatabaseTest, LikeDecomposes);
// Do static initialisation like loading sqlite functions.
static void StaticInit();

7
tests/database_test.cpp
View File

@ -124,3 +124,10 @@ TEST_F(DatabaseTest, LikeQuerySplit) {
EXPECT_FALSE(database_->Like("%foo bar%", "foobaz"));
EXPECT_FALSE(database_->Like("%foo bar%", "baz"));
}
TEST_F(DatabaseTest, LikeDecomposes) {
EXPECT_TRUE(database_->Like("%Royksopp%", "Röyksopp"));
EXPECT_FALSE(database_->Like("%Ryksopp%", "Röyksopp"));
EXPECT_TRUE(database_->Like("%tiesto%", "DJ Tiësto"));
EXPECT_FALSE(database_->Like("%tisto%", "DJ Tiësto"));
}