mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-12 12:54:29 +00:00
Add support to tags: scheme in DolphinQuery
It allows to start a search from a `tags:/mytag/` view. The use case is to refine a search on additional terms (another tags, ratings, etc)
This commit is contained in:
parent
2463a35f3e
commit
2fc117703f
|
@ -73,6 +73,14 @@ namespace {
|
|||
return textParts;
|
||||
}
|
||||
#endif
|
||||
|
||||
QString trimChar(const QString& text, const QLatin1Char aChar)
|
||||
{
|
||||
const int start = text.startsWith(aChar) ? 1 : 0;
|
||||
const int end = (text.length() > 1 && text.endsWith(aChar)) ? 1 : 0;
|
||||
|
||||
return text.mid(start, text.length() - start - end);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -83,6 +91,10 @@ DolphinQuery DolphinQuery::fromSearchUrl(const QUrl& searchUrl)
|
|||
|
||||
if (searchUrl.scheme() == QLatin1String("baloosearch")) {
|
||||
model.parseBalooQuery();
|
||||
} else if (searchUrl.scheme() == QLatin1String("tags")) {
|
||||
// tags can contain # symbols or slashes within the Url
|
||||
QString tag = trimChar(searchUrl.toString(QUrl::RemoveScheme), QLatin1Char('/'));
|
||||
model.m_searchTerms << QStringLiteral("tag:%1").arg(tag);
|
||||
}
|
||||
|
||||
return model;
|
||||
|
@ -92,6 +104,7 @@ bool DolphinQuery::supportsScheme(const QString& urlScheme)
|
|||
{
|
||||
static const QStringList supportedSchemes = {
|
||||
QStringLiteral("baloosearch"),
|
||||
QStringLiteral("tags"),
|
||||
};
|
||||
|
||||
return supportedSchemes.contains(urlScheme);
|
||||
|
|
|
@ -150,6 +150,15 @@ void DolphinSearchBoxTest::testBalooSearchParsing_data()
|
|||
QTest::newRow("allTerms/space")
|
||||
<< balooQueryUrl(textS + " " + filenameS + " " + rating + " AND " + modified + " AND " + tagS)
|
||||
<< textS + " " + filenameS << QStringList({modified, rating, tagR}) << true << true;
|
||||
|
||||
// Test tags:/ URL scheme
|
||||
const auto tagUrl = [](const QString &tag) { return QUrl(QStringLiteral("tags:/%1/").arg(tag)); };
|
||||
const auto tagTerms = [](const QString &tag) { return QStringList{QStringLiteral("tag:%1").arg(tag)}; };
|
||||
|
||||
QTest::newRow("tagsUrl") << tagUrl("tagA") << "" << tagTerms("tagA") << false << false;
|
||||
QTest::newRow("tagsUrl/space") << tagUrl("tagB with spaces") << "" << tagTerms("tagB with spaces") << false << false;
|
||||
QTest::newRow("tagsUrl/hash") << tagUrl("tagC#hash") << "" << tagTerms("tagC#hash") << false << false;
|
||||
QTest::newRow("tagsUrl/slash") << tagUrl("tagD/with/slash") << "" << tagTerms("tagD/with/slash") << false << false;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue