Changeset View
Changeset View
Standalone View
Standalone View
libtaskmanager/tasktools.cpp
| Show All 36 Lines | |||||
| 37 | #include <KWindowSystem> | 37 | #include <KWindowSystem> | ||
| 38 | 38 | | |||
| 39 | #include <processcore/processes.h> | 39 | #include <processcore/processes.h> | ||
| 40 | #include <processcore/process.h> | 40 | #include <processcore/process.h> | ||
| 41 | 41 | | |||
| 42 | #include <config-X11.h> | 42 | #include <config-X11.h> | ||
| 43 | 43 | | |||
| 44 | #include <QDir> | 44 | #include <QDir> | ||
| 45 | #include <QGuiApplication> | 45 | #include <QGuiApplication> | ||
cfeck: Can be removed? If not, sort correctly. | |||||
| 46 | #include <QRegularExpression> | 46 | #include <QRegularExpression> | ||
| 47 | #include <QScreen> | 47 | #include <QScreen> | ||
| 48 | #if HAVE_X11 | 48 | #if HAVE_X11 | ||
| 49 | #include <QX11Info> | 49 | #include <QX11Info> | ||
| 50 | #endif | 50 | #endif | ||
| 51 | 51 | | |||
| 52 | namespace TaskManager | 52 | namespace TaskManager | ||
| 53 | { | 53 | { | ||
| ▲ Show 20 Lines • Show All 156 Lines • ▼ Show 20 Line(s) | 209 | { | |||
| 210 | if (!rulesConfig) { | 210 | if (!rulesConfig) { | ||
| 211 | return QUrl(); | 211 | return QUrl(); | ||
| 212 | } | 212 | } | ||
| 213 | 213 | | |||
| 214 | QUrl url; | 214 | QUrl url; | ||
| 215 | KService::List services; | 215 | KService::List services; | ||
| 216 | bool triedPid = false; | 216 | bool triedPid = false; | ||
| 217 | 217 | | |||
| 218 | // The code below this function goes on a hunt for services based on the metadata | ||||
| 219 | // that has been passed in. Occasionally, it will find more than one matching | ||||
| 220 | // service. In some scenarios (e.g. multiple identically-named .desktop files) | ||||
| 221 | // there's a need to pick the most useful one. The function below promises to "sort" | ||||
| 222 | // a list of services by how closely their KService::menuId() relates to the key that | ||||
| 223 | // has been passed in. The current naive implementation simply looks for a menuId | ||||
| 224 | // that starts with the key, prepends it to the list and returns it. In practice, | ||||
| 225 | // that means a KService with a menuId matching the appId will win over one with a | ||||
| 226 | // menuId that encodes a subfolder hierarchy. | ||||
| 227 | // A concrete example: Valve's Steam client is sometimes installed two times, once | ||||
This comment makes it sound like this pretends to be a generic solution to a particular workaround. But you told me there's also Telegram and others being affected (fixed) by this, right? broulik: This comment makes it sound like this pretends to be a generic solution to a particular… | |||||
I started doing this for the Wine thing based on a user bug report. But for some reason I did wind up with two .desktop files for Telegram on my system, I think one from the Fedora package and one from ... a Flatpak? Their tarball? Who knows. In any case, this algo helps pick the right one there, too. The general idea of "if we find more than one service, the one with a menuId that's more closely related to the search term we found them with" seems to be better than "just use whatever KSTT returns first", considering KSTT does no sorting whatsoever. hein: I started doing this for the Wine thing based on a user bug report. But for some reason I did… | |||||
| 228 | // natively as a Linux application, once via Wine. Both have .desktop files named | ||||
| 229 | // (S|)steam.desktop. The Linux native version is located in the menu by means of | ||||
| 230 | // categorization ("Games") and just has a menuId() matching the .desktop file name, | ||||
| 231 | // but the Wine version is placed in a folder hierarchy by Wine and gets a menuId() | ||||
| 232 | // of wine-Programs-Steam-Steam.desktop. The weighing done by this function makes | ||||
| 233 | // sure the Linux native version gets mapped to the former, while other heuristics | ||||
| 234 | // map the Wine version reliably to the latter. | ||||
| 235 | // In lieu of this weighing we just used whatever KServiceTypeTrader returned first, | ||||
| 236 | // so what we do here can be no worse. | ||||
| 237 | auto sortServicesByMenuId = [](KService::List &services, const QString &key) { | ||||
| 238 | if (services.count() == 1) { | ||||
| 239 | return services; | ||||
| 240 | } | ||||
| 241 | | ||||
| 242 | for (const auto service : services) { | ||||
broulik: Is there some nicer algo in place of this loop? | |||||
hein: You tell me? :) | |||||
| 243 | if (service->menuId().startsWith(key, Qt::CaseInsensitive)) { | ||||
| 244 | services.prepend(service); | ||||
You're mutating the list (argument services is a non-const reference) and also returning it. Is this intentional? broulik: You're mutating the list (argument `services` is a non-`const` reference) and also returning it. | |||||
Yes. It's just faster and less costly than actually sorting the list. This is a bit ugly, but it takes the stance of "this is a private anonymous function so it can't hurt any lib user, and if this sorting algo ever needs to be more sophisticated we'll fill it in then". hein: Yes. It's just faster and less costly than actually sorting the list. This is a bit ugly, but… | |||||
| 245 | return services; | ||||
| 246 | } | ||||
| 247 | } | ||||
| 248 | | ||||
| 249 | return services; | ||||
| 250 | }; | ||||
| 251 | | ||||
| 218 | if (!(appId.isEmpty() && xWindowsWMClassName.isEmpty())) { | 252 | if (!(appId.isEmpty() && xWindowsWMClassName.isEmpty())) { | ||
| 219 | // Check to see if this wmClass matched a saved one ... | 253 | // Check to see if this wmClass matched a saved one ... | ||
| 220 | KConfigGroup grp(rulesConfig, "Mapping"); | 254 | KConfigGroup grp(rulesConfig, "Mapping"); | ||
| 221 | KConfigGroup set(rulesConfig, "Settings"); | 255 | KConfigGroup set(rulesConfig, "Settings"); | ||
| 222 | 256 | | |||
| 223 | // Evaluate MatchCommandLineFirst directives from config first. | 257 | // Evaluate MatchCommandLineFirst directives from config first. | ||
| 224 | // Some apps have different launchers depending upon command line ... | 258 | // Some apps have different launchers depending upon command line ... | ||
| 225 | QStringList matchCommandLineFirst = set.readEntry("MatchCommandLineFirst", QStringList()); | 259 | QStringList matchCommandLineFirst = set.readEntry("MatchCommandLineFirst", QStringList()); | ||
| ▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Line(s) | 272 | if (!appId.isEmpty()) { | |||
| 267 | // sensibly to instruct us what to do. Also, mapping rules | 301 | // sensibly to instruct us what to do. Also, mapping rules | ||
| 268 | // | 302 | // | ||
| 269 | // StartupWMClass=STRING | 303 | // StartupWMClass=STRING | ||
| 270 | // | 304 | // | ||
| 271 | // If true, it is KNOWN that the application will map at least one | 305 | // If true, it is KNOWN that the application will map at least one | ||
| 272 | // window with the given string as its WM class or WM name hint. | 306 | // window with the given string as its WM class or WM name hint. | ||
| 273 | // | 307 | // | ||
| 274 | // Source: https://specifications.freedesktop.org/startup-notification-spec/startup-notification-0.1.txt | 308 | // Source: https://specifications.freedesktop.org/startup-notification-spec/startup-notification-0.1.txt | ||
| 275 | if (services.empty()) { | 309 | if (services.isEmpty()) { | ||
| 276 | services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), QStringLiteral("exist Exec and ('%1' =~ StartupWMClass)").arg(appId)); | 310 | services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), QStringLiteral("exist Exec and ('%1' =~ StartupWMClass)").arg(appId)); | ||
| 311 | services = sortServicesByMenuId(services, appId); | ||||
| 277 | } | 312 | } | ||
| 278 | 313 | | |||
| 279 | if (services.empty()) { | 314 | if (services.isEmpty()) { | ||
| 280 | services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), QStringLiteral("exist Exec and ('%1' =~ StartupWMClass)").arg(xWindowsWMClassName)); | 315 | services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), QStringLiteral("exist Exec and ('%1' =~ StartupWMClass)").arg(xWindowsWMClassName)); | ||
| 316 | services = sortServicesByMenuId(services, xWindowsWMClassName); | ||||
| 281 | } | 317 | } | ||
| 282 | 318 | | |||
| 283 | // Evaluate rewrite rules from config. | 319 | // Evaluate rewrite rules from config. | ||
| 284 | if (services.empty()) { | 320 | if (services.isEmpty()) { | ||
| 285 | KConfigGroup rewriteRulesGroup(rulesConfig, QStringLiteral("Rewrite Rules")); | 321 | KConfigGroup rewriteRulesGroup(rulesConfig, QStringLiteral("Rewrite Rules")); | ||
| 286 | if (rewriteRulesGroup.hasGroup(appId)) { | 322 | if (rewriteRulesGroup.hasGroup(appId)) { | ||
| 287 | KConfigGroup rewriteGroup(&rewriteRulesGroup, appId); | 323 | KConfigGroup rewriteGroup(&rewriteRulesGroup, appId); | ||
| 288 | 324 | | |||
| 289 | const QStringList &rules = rewriteGroup.groupList(); | 325 | const QStringList &rules = rewriteGroup.groupList(); | ||
| 290 | for (const QString &rule : rules) { | 326 | for (const QString &rule : rules) { | ||
| 291 | KConfigGroup ruleGroup(&rewriteGroup, rule); | 327 | KConfigGroup ruleGroup(&rewriteGroup, rule); | ||
| 292 | 328 | | |||
| Show All 26 Lines | 350 | if (match.hasMatch()) { | |||
| 319 | 355 | | |||
| 320 | QString rewrittenString = ruleGroup.readEntry(QStringLiteral("Target")).arg(actualMatch); | 356 | QString rewrittenString = ruleGroup.readEntry(QStringLiteral("Target")).arg(actualMatch); | ||
| 321 | // If no "Target" is provided, instead assume the matched property (appId/xWindowsWMClassName). | 357 | // If no "Target" is provided, instead assume the matched property (appId/xWindowsWMClassName). | ||
| 322 | if (rewrittenString.isEmpty()) { | 358 | if (rewrittenString.isEmpty()) { | ||
| 323 | rewrittenString = matchProperty; | 359 | rewrittenString = matchProperty; | ||
| 324 | } | 360 | } | ||
| 325 | 361 | | |||
| 326 | services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), QStringLiteral("exist Exec and ('%1' =~ %2)").arg(rewrittenString, serviceSearchIdentifier)); | 362 | services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), QStringLiteral("exist Exec and ('%1' =~ %2)").arg(rewrittenString, serviceSearchIdentifier)); | ||
| 363 | services = sortServicesByMenuId(services, serviceSearchIdentifier); | ||||
| 327 | 364 | | |||
| 328 | if (!services.isEmpty()) { | 365 | if (!services.isEmpty()) { | ||
| 329 | break; | 366 | break; | ||
| 330 | } | 367 | } | ||
| 331 | } | 368 | } | ||
| 332 | } | 369 | } | ||
| 333 | } | 370 | } | ||
| 334 | } | 371 | } | ||
| 335 | 372 | | |||
| 336 | // The appId looks like a path. | 373 | // The appId looks like a path. | ||
| 337 | if (appId.startsWith(QStringLiteral("/"))) { | 374 | if (services.isEmpty() && appId.startsWith(QStringLiteral("/"))) { | ||
broulik: `isEmpty` (unless consistent with the rest but it seems to be mixed already) | |||||
hein: Will change. | |||||
| 338 | // Check if it's a path to a .desktop file. | 375 | // Check if it's a path to a .desktop file. | ||
| 339 | if (KDesktopFile::isDesktopFile(appId) && QFile::exists(appId)) { | 376 | if (KDesktopFile::isDesktopFile(appId) && QFile::exists(appId)) { | ||
| 340 | return QUrl::fromLocalFile(appId); | 377 | return QUrl::fromLocalFile(appId); | ||
| 341 | } | 378 | } | ||
| 342 | 379 | | |||
| 343 | // Check if the appId passes as a .desktop file path if we add the extension. | 380 | // Check if the appId passes as a .desktop file path if we add the extension. | ||
| 344 | const QString appIdPlusExtension(appId + QStringLiteral(".desktop")); | 381 | const QString appIdPlusExtension(appId + QStringLiteral(".desktop")); | ||
| 345 | 382 | | |||
| 346 | if (KDesktopFile::isDesktopFile(appIdPlusExtension) && QFile::exists(appIdPlusExtension)) { | 383 | if (KDesktopFile::isDesktopFile(appIdPlusExtension) && QFile::exists(appIdPlusExtension)) { | ||
| 347 | return QUrl::fromLocalFile(appIdPlusExtension); | 384 | return QUrl::fromLocalFile(appIdPlusExtension); | ||
| 348 | } | 385 | } | ||
| 349 | } | 386 | } | ||
| 350 | 387 | | |||
| 351 | // Try matching mapped name against DesktopEntryName. | 388 | // Try matching mapped name against DesktopEntryName. | ||
| 352 | if (!mapped.isEmpty() && services.empty()) { | 389 | if (!mapped.isEmpty() && services.isEmpty()) { | ||
| 353 | services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), QStringLiteral("exist Exec and ('%1' =~ DesktopEntryName) and (not exist NoDisplay or not NoDisplay)").arg(mapped)); | 390 | services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), QStringLiteral("exist Exec and ('%1' =~ DesktopEntryName) and (not exist NoDisplay or not NoDisplay)").arg(mapped)); | ||
| 391 | services = sortServicesByMenuId(services, mapped); | ||||
| 354 | } | 392 | } | ||
| 355 | 393 | | |||
| 356 | // Try matching mapped name against 'Name'. | 394 | // Try matching mapped name against 'Name'. | ||
| 357 | if (!mapped.isEmpty() && services.empty()) { | 395 | if (!mapped.isEmpty() && services.isEmpty()) { | ||
| 358 | services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), QStringLiteral("exist Exec and ('%1' =~ Name) and (not exist NoDisplay or not NoDisplay)").arg(mapped)); | 396 | services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), QStringLiteral("exist Exec and ('%1' =~ Name) and (not exist NoDisplay or not NoDisplay)").arg(mapped)); | ||
| 397 | services = sortServicesByMenuId(services, mapped); | ||||
| 359 | } | 398 | } | ||
| 360 | 399 | | |||
| 361 | // Try matching appId against DesktopEntryName. | 400 | // Try matching appId against DesktopEntryName. | ||
| 362 | if (services.empty()) { | 401 | if (services.isEmpty()) { | ||
| 363 | services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), QStringLiteral("exist Exec and ('%1' =~ DesktopEntryName) and (not exist NoDisplay or not NoDisplay)").arg(appId)); | 402 | services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), QStringLiteral("exist Exec and ('%1' =~ DesktopEntryName) and (not exist NoDisplay or not NoDisplay)").arg(appId)); | ||
| 403 | services = sortServicesByMenuId(services, appId); | ||||
| 364 | } | 404 | } | ||
| 365 | 405 | | |||
| 366 | // Try matching appId against 'Name'. | 406 | // Try matching appId against 'Name'. | ||
| 367 | // This has a shaky chance of success as appId is untranslated, but 'Name' may be localized. | 407 | // This has a shaky chance of success as appId is untranslated, but 'Name' may be localized. | ||
| 368 | if (services.empty()) { | 408 | if (services.isEmpty()) { | ||
| 369 | services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), QStringLiteral("exist Exec and ('%1' =~ Name) and (not exist NoDisplay or not NoDisplay)").arg(appId)); | 409 | services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), QStringLiteral("exist Exec and ('%1' =~ Name) and (not exist NoDisplay or not NoDisplay)").arg(appId)); | ||
| 410 | services = sortServicesByMenuId(services, appId); | ||||
| 370 | } | 411 | } | ||
| 371 | } | 412 | } | ||
| 372 | 413 | | |||
| 373 | // Ok, absolute *last* chance, try matching via pid (but only if we have not already tried this!) ... | 414 | // Ok, absolute *last* chance, try matching via pid (but only if we have not already tried this!) ... | ||
| 374 | if (services.empty() && !triedPid) { | 415 | if (services.isEmpty() && !triedPid) { | ||
| 375 | services = servicesFromPid(pid, rulesConfig); | 416 | services = servicesFromPid(pid, rulesConfig); | ||
| 376 | } | 417 | } | ||
| 377 | } | 418 | } | ||
| 378 | 419 | | |||
| 379 | // Try to improve on a possible from-binary fallback. | 420 | // Try to improve on a possible from-binary fallback. | ||
| 380 | // If no services were found or we got a fake-service back from getServicesViaPid() | 421 | // If no services were found or we got a fake-service back from getServicesViaPid() | ||
| 381 | // we attempt to improve on this by adding a loosely matched reverse-domain-name | 422 | // we attempt to improve on this by adding a loosely matched reverse-domain-name | ||
| 382 | // DesktopEntryName. Namely anything that is '*.appId.desktop' would qualify here. | 423 | // DesktopEntryName. Namely anything that is '*.appId.desktop' would qualify here. | ||
| 383 | // | 424 | // | ||
| 384 | // Illustrative example of a case where the above heuristics would fail to produce | 425 | // Illustrative example of a case where the above heuristics would fail to produce | ||
| 385 | // a reasonable result: | 426 | // a reasonable result: | ||
| 386 | // - org.kde.dragonplayer.desktop | 427 | // - org.kde.dragonplayer.desktop | ||
| 387 | // - binary is 'dragon' | 428 | // - binary is 'dragon' | ||
| 388 | // - qapp appname and thus appId is 'dragonplayer' | 429 | // - qapp appname and thus appId is 'dragonplayer' | ||
| 389 | // - appId cannot directly match the desktop file because of RDN | 430 | // - appId cannot directly match the desktop file because of RDN | ||
| 390 | // - appId also cannot match the binary because of name mismatch | 431 | // - appId also cannot match the binary because of name mismatch | ||
| 391 | // - in the following code *.appId can match org.kde.dragonplayer though | 432 | // - in the following code *.appId can match org.kde.dragonplayer though | ||
| 392 | if (services.empty() || services.at(0)->desktopEntryName().isEmpty()) { | 433 | if (services.isEmpty() || services.at(0)->desktopEntryName().isEmpty()) { | ||
| 393 | auto matchingServices = KServiceTypeTrader::self()->query(QStringLiteral("Application"), | 434 | auto matchingServices = KServiceTypeTrader::self()->query(QStringLiteral("Application"), | ||
| 394 | QStringLiteral("exist Exec and ('%1' ~~ DesktopEntryName)").arg(appId)); | 435 | QStringLiteral("exist Exec and ('%1' ~~ DesktopEntryName)").arg(appId)); | ||
| 395 | QMutableListIterator<KService::Ptr> it(matchingServices); | 436 | QMutableListIterator<KService::Ptr> it(matchingServices); | ||
| 396 | while (it.hasNext()) { | 437 | while (it.hasNext()) { | ||
| 397 | auto service = it.next(); | 438 | auto service = it.next(); | ||
| 398 | if (!service->desktopEntryName().endsWith("." + appId)) { | 439 | if (!service->desktopEntryName().endsWith("." + appId)) { | ||
| 399 | it.remove(); | 440 | it.remove(); | ||
| 400 | } | 441 | } | ||
| 401 | } | 442 | } | ||
| 402 | // Exactly one match is expected, otherwise we discard the results as to reduce | 443 | // Exactly one match is expected, otherwise we discard the results as to reduce | ||
| 403 | // the likelihood of false-positive mappings. Since we essentially eliminate the | 444 | // the likelihood of false-positive mappings. Since we essentially eliminate the | ||
| 404 | // uniqueness that RDN is meant to bring to the table we could potentially end | 445 | // uniqueness that RDN is meant to bring to the table we could potentially end | ||
| 405 | // up with more than one match here. | 446 | // up with more than one match here. | ||
| 406 | if (matchingServices.length() == 1) { | 447 | if (matchingServices.length() == 1) { | ||
| 407 | services = matchingServices; | 448 | services = matchingServices; | ||
| 408 | } | 449 | } | ||
| 409 | } | 450 | } | ||
| 410 | 451 | | |||
| 411 | if (!services.empty()) { | 452 | if (!services.isEmpty()) { | ||
| 412 | const QString &menuId = services.at(0)->menuId(); | 453 | const QString &menuId = services.at(0)->menuId(); | ||
| 413 | 454 | | |||
| 414 | // applications: URLs are used to refer to applications by their KService::menuId | 455 | // applications: URLs are used to refer to applications by their KService::menuId | ||
| 415 | // (i.e. .desktop file name) rather than the absolute path to a .desktop file. | 456 | // (i.e. .desktop file name) rather than the absolute path to a .desktop file. | ||
| 416 | if (!menuId.isEmpty()) { | 457 | if (!menuId.isEmpty()) { | ||
| 417 | return QUrl(QStringLiteral("applications:") + menuId); | 458 | return QUrl(QStringLiteral("applications:") + menuId); | ||
| 418 | } | 459 | } | ||
| 419 | 460 | | |||
| ▲ Show 20 Lines • Show All 44 Lines • ▼ Show 20 Line(s) | 504 | if (!rulesConfig) { | |||
| 464 | return services; | 505 | return services; | ||
| 465 | } | 506 | } | ||
| 466 | 507 | | |||
| 467 | const int firstSpace = cmdLine.indexOf(' '); | 508 | const int firstSpace = cmdLine.indexOf(' '); | ||
| 468 | int slash = 0; | 509 | int slash = 0; | ||
| 469 | 510 | | |||
| 470 | services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), QStringLiteral("exist Exec and ('%1' =~ Exec)").arg(cmdLine)); | 511 | services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), QStringLiteral("exist Exec and ('%1' =~ Exec)").arg(cmdLine)); | ||
| 471 | 512 | | |||
| 472 | if (services.empty()) { | 513 | if (services.isEmpty()) { | ||
| 473 | // Could not find with complete command line, so strip out the path part ... | 514 | // Could not find with complete command line, so strip out the path part ... | ||
| 474 | slash = cmdLine.lastIndexOf('/', firstSpace); | 515 | slash = cmdLine.lastIndexOf('/', firstSpace); | ||
| 475 | 516 | | |||
| 476 | if (slash > 0) { | 517 | if (slash > 0) { | ||
| 477 | services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), QStringLiteral("exist Exec and ('%1' =~ Exec)").arg(cmdLine.mid(slash + 1))); | 518 | services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), QStringLiteral("exist Exec and ('%1' =~ Exec)").arg(cmdLine.mid(slash + 1))); | ||
| 478 | } | 519 | } | ||
| 479 | } | 520 | } | ||
| 480 | 521 | | |||
| 481 | if (services.empty() && firstSpace > 0) { | 522 | if (services.isEmpty() && firstSpace > 0) { | ||
| 482 | // Could not find with arguments, so try without ... | 523 | // Could not find with arguments, so try without ... | ||
| 483 | cmdLine = cmdLine.left(firstSpace); | 524 | cmdLine = cmdLine.left(firstSpace); | ||
| 484 | 525 | | |||
| 485 | services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), QStringLiteral("exist Exec and ('%1' =~ Exec)").arg(cmdLine)); | 526 | services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), QStringLiteral("exist Exec and ('%1' =~ Exec)").arg(cmdLine)); | ||
| 486 | 527 | | |||
| 487 | if (services.empty()) { | 528 | if (services.isEmpty()) { | ||
| 488 | slash = cmdLine.lastIndexOf('/'); | 529 | slash = cmdLine.lastIndexOf('/'); | ||
| 489 | 530 | | |||
| 490 | if (slash > 0) { | 531 | if (slash > 0) { | ||
| 491 | services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), QStringLiteral("exist Exec and ('%1' =~ Exec)").arg(cmdLine.mid(slash + 1))); | 532 | services = KServiceTypeTrader::self()->query(QStringLiteral("Application"), QStringLiteral("exist Exec and ('%1' =~ Exec)").arg(cmdLine.mid(slash + 1))); | ||
| 492 | } | 533 | } | ||
| 493 | } | 534 | } | ||
| 494 | } | 535 | } | ||
| 495 | 536 | | |||
| 496 | if (services.empty()) { | 537 | if (services.isEmpty()) { | ||
| 497 | KConfigGroup set(rulesConfig, "Settings"); | 538 | KConfigGroup set(rulesConfig, "Settings"); | ||
| 498 | const QStringList &runtimes = set.readEntry("TryIgnoreRuntimes", QStringList()); | 539 | const QStringList &runtimes = set.readEntry("TryIgnoreRuntimes", QStringList()); | ||
| 499 | 540 | | |||
| 500 | bool ignore = runtimes.contains(cmdLine); | 541 | bool ignore = runtimes.contains(cmdLine); | ||
| 501 | 542 | | |||
| 502 | if (!ignore && slash > 0) { | 543 | if (!ignore && slash > 0) { | ||
| 503 | ignore = runtimes.contains(cmdLine.mid(slash + 1)); | 544 | ignore = runtimes.contains(cmdLine.mid(slash + 1)); | ||
| 504 | } | 545 | } | ||
| 505 | 546 | | |||
| 506 | if (ignore) { | 547 | if (ignore) { | ||
| 507 | return servicesFromCmdLine(_cmdLine.mid(firstSpace + 1), processName, rulesConfig); | 548 | return servicesFromCmdLine(_cmdLine.mid(firstSpace + 1), processName, rulesConfig); | ||
| 508 | } | 549 | } | ||
| 509 | } | 550 | } | ||
| 510 | 551 | | |||
| 511 | if (services.empty() && !processName.isEmpty() && !QStandardPaths::findExecutable(cmdLine).isEmpty()) { | 552 | if (services.isEmpty() && !processName.isEmpty() && !QStandardPaths::findExecutable(cmdLine).isEmpty()) { | ||
| 512 | // cmdLine now exists without arguments if there were any. | 553 | // cmdLine now exists without arguments if there were any. | ||
| 513 | services << QExplicitlySharedDataPointer<KService>(new KService(processName, cmdLine, QString())); | 554 | services << QExplicitlySharedDataPointer<KService>(new KService(processName, cmdLine, QString())); | ||
| 514 | } | 555 | } | ||
| 515 | 556 | | |||
| 516 | return services; | 557 | return services; | ||
| 517 | } | 558 | } | ||
| 518 | 559 | | |||
| 519 | QString defaultApplication(const QUrl &url) | 560 | QString defaultApplication(const QUrl &url) | ||
| ▲ Show 20 Lines • Show All 225 Lines • Show Last 20 Lines | |||||
Can be removed? If not, sort correctly.