Differential D5870 Diff 14559 runners/services/servicerunner.cpp

Changeset View

Standalone View

View Options

runners/services/servicerunner.cpp

Context not available.
93 return ret; 93​ return ret;
94 } 94​ }
95 95​
96​ qreal increaseMatchRelavance(const KService::Ptr &service, QStringList &strList, QString category)
97​ {
98​ //Increment the relevance based on all the words (other than the first) of the query list
99​ qreal relevanceIncrement = 0;
100​
101​ for(int i=1; i<strList.size(); i++)
apolUnsubmitted
Not Done

use a foreach

apol: use a foreach
rthomasAuthorUnsubmitted
Not Done

I'm skipping the first string in strList because that string has already been accounted for relavace right before the call to increaseMatchRelavance. Relevance is incremented by 0.01 only based on the second string onwards. I don't think you can skip iterations based on indices in a foreach loop.

rthomas: I'm skipping the first string in strList because that string has already been accounted for…
102​ {
103​ if (category == "Name") {
104​ if (service->name().contains(strList[i], Qt::CaseInsensitive)) {
105​ relevanceIncrement += 0.01;
106​ }
107​ } else if (category == "GenericName") {
108​ if (service->genericName().contains(strList[i], Qt::CaseInsensitive)) {
109​ relevanceIncrement += 0.01;
110​ }
111​ } else if (category == "Exec") {
112​ if (service->exec().contains(strList[i], Qt::CaseInsensitive)) {
113​ relevanceIncrement += 0.01;
114​ }
115​ } else if (category == "Comment") {
116​ if (service->comment().contains(strList[i], Qt::CaseInsensitive)) {
117​ relevanceIncrement += 0.01;
118​ }
119​ }
120​ }
121​
122​ return relevanceIncrement;
123​ }
124​
125​ QString generateQuery(QStringList &strList)
126​ {
127​ QString keywordTemplate = "exist Keywords";
128​ QString genericNameTemplate = "exist GenericName";
129​ QString nameTemplate = "exist Name";
130​ QString commentTemplate = "exist Comment";
131​
132​ // Search for applications which are executable and the term case-insensitive matches any of
133​ // * a substring of one of the keywords
134​ // * a substring of the GenericName field
135​ // * a substring of the Name field
136​ // Note that before asking for the content of e.g. Keywords and GenericName we need to ask if
137​ // they exist to prevent a tree evaluation error if they are not defined.
138​ foreach (QString str, strList)
139​ {
140​ keywordTemplate += QString(" and '%1' ~subin Keywords").arg(str);
141​ genericNameTemplate += QString(" and '%1' ~~ GenericName").arg(str);
142​ nameTemplate += QString(" and '%1' ~~ Name").arg(str);
143​ commentTemplate += QString(" and '%1' ~~ Comment").arg(str);
144​ }
145​
146​ QString finalQuery = QStringLiteral("exist Exec and ( (%1) or (%2) or (%3) or ('%4' ~~ Exec) or (%5) )")
147​ .arg(keywordTemplate, genericNameTemplate, nameTemplate, strList[0], commentTemplate);
148​
149​ qCDebug(RUNNER_SERVICES) << "Final query : " << finalQuery;
150​ return finalQuery;
151​ }
152​
96 void setupMatch(const KService::Ptr &service, Plasma::QueryMatch &match) 153​ void setupMatch(const KService::Ptr &service, Plasma::QueryMatch &match)
97 { 154​ {
98 const QString name = service->name(); 155​ const QString name = service->name();
Context not available.
142 199​
143 void matchNameKeywordAndGenericName() 200​ void matchNameKeywordAndGenericName()
144 { 201​ {
202​ //Splitting the query term to match using subsequences
203​ QStringList queryList = term.split(" ");
apolUnsubmitted
Done

splitRef(QLatin1Char(' '))?

apol: `splitRef(QLatin1Char(' '))`?
rthomasAuthorUnsubmitted
Done

Could you explain why would we want to use splitRef instead of split? I'm not sure I understand the need for it.

rthomas: Could you explain why would we want to use splitRef instead of split? I'm not sure I understand…
davidedmundsonUnsubmitted
Done

split copies the strings.
splitRef creates references to a location within an exitsting string without copying it.

Result is the same but faster.

davidedmundson: split copies the strings. splitRef creates references to a location within an exitsting string…
204​
145 // If the term length is < 3, no real point searching the Keywords and GenericName 205​ // If the term length is < 3, no real point searching the Keywords and GenericName
146 if (term.length() < 3) { 206​ if (term.length() < 3) {
147 query = QStringLiteral("exist Exec and ( (exist Name and '%1' ~~ Name) or ('%1' ~~ Exec) )").arg(term); 207​ query = QStringLiteral("exist Exec and ( (exist Name and '%1' ~~ Name) or ('%1' ~~ Exec) )").arg(term);
148 } else { 208​ } else {
149 // Search for applications which are executable and the term case-insensitive matches any of 209​ //Match using subsequences (Bug: 262837)
150 // * a substring of one of the keywords 210​ query = generateQuery(queryList);
151 // * a substring of the GenericName field ​
152 // * a substring of the Name field ​
153 // Note that before asking for the content of e.g. Keywords and GenericName we need to ask if ​
154 // they exist to prevent a tree evaluation error if they are not defined. ​
155 query = QStringLiteral("exist Exec and ( (exist Keywords and '%1' ~subin Keywords) or (exist GenericName and '%1' ~~ GenericName) or (exist Name and '%1' ~~ Name) or ('%1' ~~ Exec) or (exist Comment and '%1' ~~ Comment) )").arg(term); ​
156 } 211​ }
157 212​
158 KService::List services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), query); 213​ KService::List services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), query);
Context not available.
181 } else { 236​ } else {
182 continue; 237​ continue;
183 } 238​ }
184 } else if (service->name().contains(term, Qt::CaseInsensitive)) { 239​ } else if (service->name().contains(queryList[0], Qt::CaseInsensitive)) {
185 relevance = 0.8; 240​ relevance = 0.8;
241​ relevance += increaseMatchRelavance(service, queryList, "Name");
186 242​
187 if (service->name().startsWith(term, Qt::CaseInsensitive)) { 243​ if (service->name().startsWith(queryList[0], Qt::CaseInsensitive)) {
188 relevance += 0.1; 244​ relevance += 0.1;
189 } 245​ }
190 } else if (service->genericName().contains(term, Qt::CaseInsensitive)) { 246​ } else if (service->genericName().contains(queryList[0], Qt::CaseInsensitive)) {
191 relevance = 0.65; 247​ relevance = 0.65;
248​ relevance += increaseMatchRelavance(service, queryList, "GenericName");
192 249​
193 if (service->genericName().startsWith(term, Qt::CaseInsensitive)) { 250​ if (service->genericName().startsWith(queryList[0], Qt::CaseInsensitive)) {
194 relevance += 0.05; 251​ relevance += 0.05;
195 } 252​ }
196 } else if (service->exec().contains(term, Qt::CaseInsensitive)) { 253​ } else if (service->exec().contains(queryList[0], Qt::CaseInsensitive)) {
197 relevance = 0.7; 254​ relevance = 0.7;
255​ relevance += increaseMatchRelavance(service, queryList, "Exec");
198 256​
199 if (service->exec().startsWith(term, Qt::CaseInsensitive)) { 257​ if (service->exec().startsWith(queryList[0], Qt::CaseInsensitive)) {
200 relevance += 0.05; 258​ relevance += 0.05;
201 } 259​ }
202 } else if (service->comment().contains(term, Qt::CaseInsensitive)) { 260​ } else if (service->comment().contains(queryList[0], Qt::CaseInsensitive)) {
203 relevance = 0.5; 261​ relevance = 0.5;
262​ relevance += increaseMatchRelavance(service, queryList, "Comment");
204 263​
205 if (service->comment().startsWith(term, Qt::CaseInsensitive)) { 264​ if (service->comment().startsWith(queryList[0], Qt::CaseInsensitive)) {
206 relevance += 0.05; 265​ relevance += 0.05;
207 } 266​ }
208 } 267​ }
Context not available.