Changeset View
Changeset View
Standalone View
Standalone View
libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
| Show All 37 Lines | |||||
| 38 | #include <QStringList> | 38 | #include <QStringList> | ||
| 39 | #include <QDebug> | 39 | #include <QDebug> | ||
| 40 | #include <QTimer> | 40 | #include <QTimer> | ||
| 41 | #include <QStandardPaths> | 41 | #include <QStandardPaths> | ||
| 42 | #include <QFile> | 42 | #include <QFile> | ||
| 43 | #include <QAction> | 43 | #include <QAction> | ||
| 44 | #include <QMimeDatabase> | 44 | #include <QMimeDatabase> | ||
| 45 | #include <QFileSystemWatcher> | 45 | #include <QFileSystemWatcher> | ||
| 46 | #include <QFutureWatcher> | ||||
| 47 | #include <QtConcurrentRun> | ||||
| 46 | 48 | | |||
| 47 | #include <PackageKit/Transaction> | 49 | #include <PackageKit/Transaction> | ||
| 48 | #include <PackageKit/Daemon> | 50 | #include <PackageKit/Daemon> | ||
| 49 | #include <PackageKit/Offline> | 51 | #include <PackageKit/Offline> | ||
| 50 | #include <PackageKit/Details> | 52 | #include <PackageKit/Details> | ||
| 51 | 53 | | |||
| 52 | #include <KLocalizedString> | 54 | #include <KLocalizedString> | ||
| 53 | #include <KProtocolManager> | 55 | #include <KProtocolManager> | ||
| ▲ Show 20 Lines • Show All 61 Lines • ▼ Show 20 Line(s) | 116 | setWhenAvailable(PackageKit::Daemon::getTimeSinceAction(PackageKit::Transaction::RoleRefreshCache), [this](uint timeSince) { | |||
| 115 | if (timeSince > 3600) | 117 | if (timeSince > 3600) | ||
| 116 | checkForUpdates(); | 118 | checkForUpdates(); | ||
| 117 | else | 119 | else | ||
| 118 | fetchUpdates(); | 120 | fetchUpdates(); | ||
| 119 | acquireFetching(false); | 121 | acquireFetching(false); | ||
| 120 | }, this); | 122 | }, this); | ||
| 121 | } | 123 | } | ||
| 122 | 124 | | |||
| 123 | PackageKitBackend::~PackageKitBackend() = default; | 125 | PackageKitBackend::~PackageKitBackend() | ||
| 126 | { | ||||
| 127 | m_threadPool.waitForDone(200); | ||||
| 128 | m_threadPool.clear(); | ||||
| 129 | } | ||||
| 124 | 130 | | |||
| 125 | void PackageKitBackend::updateProxy() | 131 | void PackageKitBackend::updateProxy() | ||
| 126 | { | 132 | { | ||
| 127 | 133 | | |||
| 128 | if (PackageKit::Daemon::isRunning()) { | 134 | if (PackageKit::Daemon::isRunning()) { | ||
| 129 | static bool everHad = KProtocolManager::useProxy(); | 135 | static bool everHad = KProtocolManager::useProxy(); | ||
| 130 | if (!everHad && !KProtocolManager::useProxy()) | 136 | if (!everHad && !KProtocolManager::useProxy()) | ||
| 131 | return; | 137 | return; | ||
| Show All 21 Lines | 158 | else | |||
| 153 | m_isFetching--; | 159 | m_isFetching--; | ||
| 154 | 160 | | |||
| 155 | if ((!f && m_isFetching==0) || (f && m_isFetching==1)) { | 161 | if ((!f && m_isFetching==0) || (f && m_isFetching==1)) { | ||
| 156 | emit fetchingChanged(); | 162 | emit fetchingChanged(); | ||
| 157 | } | 163 | } | ||
| 158 | Q_ASSERT(m_isFetching>=0); | 164 | Q_ASSERT(m_isFetching>=0); | ||
| 159 | } | 165 | } | ||
| 160 | 166 | | |||
| 161 | void PackageKitBackend::reloadPackageList() | 167 | struct DelayedAppStreamLoad { | ||
| 168 | QVector<AppStream::Component> components; | ||||
| 169 | QHash<QString, AppStream::Component> missingComponents; | ||||
| 170 | bool correct = true; | ||||
| 171 | }; | ||||
| 172 | | ||||
| 173 | static DelayedAppStreamLoad loadAppStream(AppStream::Pool* appdata) | ||||
| 162 | { | 174 | { | ||
| 163 | qDebug() << "xxx"; | 175 | DelayedAppStreamLoad ret; | ||
| 164 | acquireFetching(true); | | |||
| 165 | if (m_refresher) { | | |||
| 166 | disconnect(m_refresher.data(), &PackageKit::Transaction::finished, this, &PackageKitBackend::reloadPackageList); | | |||
| 167 | } | | |||
| 168 | 176 | | |||
| 169 | QString error; | 177 | QString error; | ||
| 170 | m_appdata.reset(new AppStream::Pool); | 178 | ret.correct = appdata->load(&error); | ||
| 171 | const bool b = m_appdata->load(&error); | 179 | if (!ret.correct) { | ||
| 172 | if (!b && m_packages.packages.isEmpty()) { | | |||
| 173 | qWarning() << "Could not open the AppStream metadata pool" << error; | 180 | qWarning() << "Could not open the AppStream metadata pool" << error; | ||
| 174 | | ||||
| 175 | QTimer::singleShot(0, this, [this]() { | | |||
| 176 | Q_EMIT passiveMessage(i18n("Please make sure that Appstream is properly set up on your system")); | | |||
| 177 | }); | | |||
| 178 | } | 181 | } | ||
| 179 | 182 | | |||
| 180 | const auto components = m_appdata->components(); | 183 | const auto components = appdata->components(); | ||
| 181 | QStringList neededPackages; | 184 | ret.components.reserve(components.size()); | ||
| 182 | neededPackages.reserve(components.size()); | | |||
| 183 | foreach(const AppStream::Component& component, components) { | 185 | foreach(const AppStream::Component& component, components) { | ||
| 184 | if (component.kind() == AppStream::Component::KindFirmware) | 186 | if (component.kind() == AppStream::Component::KindFirmware) | ||
| 185 | continue; | 187 | continue; | ||
| 186 | 188 | | |||
| 187 | const auto pkgNames = component.packageNames(); | 189 | const auto pkgNames = component.packageNames(); | ||
| 188 | if (pkgNames.isEmpty()) { | 190 | if (pkgNames.isEmpty()) { | ||
| 189 | const auto entries = component.launchable(AppStream::Launchable::KindDesktopId).entries(); | 191 | const auto entries = component.launchable(AppStream::Launchable::KindDesktopId).entries(); | ||
| 190 | if (component.kind() == AppStream::Component::KindDesktopApp && !entries.isEmpty()) { | 192 | if (component.kind() == AppStream::Component::KindDesktopApp && !entries.isEmpty()) { | ||
| 191 | const QString file = locateService(entries.first()); | 193 | const QString file = PackageKitBackend::locateService(entries.first()); | ||
| 192 | if (!file.isEmpty()) { | 194 | if (!file.isEmpty()) { | ||
| 195 | ret.missingComponents[file] = component; | ||||
| 196 | } | ||||
| 197 | } | ||||
| 198 | } else | ||||
broulik: Coding style .. | |||||
| 199 | ret.components << component; | ||||
| 200 | } | ||||
| 201 | return ret; | ||||
| 202 | } | ||||
| 203 | | ||||
| 204 | void PackageKitBackend::reloadPackageList() | ||||
| 205 | { | ||||
| 206 | acquireFetching(true); | ||||
| 207 | if (m_refresher) { | ||||
| 208 | disconnect(m_refresher.data(), &PackageKit::Transaction::finished, this, &PackageKitBackend::reloadPackageList); | ||||
| 209 | } | ||||
| 210 | | ||||
| 211 | m_appdata.reset(new AppStream::Pool); | ||||
| 212 | | ||||
| 213 | auto fw = new QFutureWatcher<DelayedAppStreamLoad>(this); | ||||
| 214 | connect(fw, &QFutureWatcher<DelayedAppStreamLoad>::finished, this, [this, fw]() { | ||||
| 215 | const auto data = fw->result(); | ||||
| 216 | fw->deleteLater(); | ||||
| 217 | | ||||
| 218 | if (!data.correct && m_packages.packages.isEmpty()) { | ||||
| 219 | QTimer::singleShot(0, this, [this]() { | ||||
| 220 | Q_EMIT passiveMessage(i18n("Please make sure that Appstream is properly set up on your system")); | ||||
| 221 | }); | ||||
| 222 | } | ||||
| 223 | QStringList neededPackages; | ||||
| 224 | neededPackages.reserve(data.components.size()); | ||||
| 225 | for (const auto &component: data.components) { | ||||
| 226 | const auto pkgNames = component.packageNames(); | ||||
| 227 | addComponent(component, pkgNames); | ||||
| 228 | neededPackages << pkgNames; | ||||
| 229 | } | ||||
| 230 | for (auto it = data.missingComponents.constBegin(), itEnd = data.missingComponents.constEnd(); it != itEnd; ++it) { | ||||
| 193 | acquireFetching(true); | 231 | acquireFetching(true); | ||
| 232 | const auto file = it.key(); | ||||
| 233 | const auto component = it.value(); | ||||
| 194 | auto trans = PackageKit::Daemon::searchFiles(file); | 234 | auto trans = PackageKit::Daemon::searchFiles(file); | ||
| 195 | connect(trans, &PackageKit::Transaction::package, this, [trans](PackageKit::Transaction::Info info, const QString &packageID){ | 235 | connect(trans, &PackageKit::Transaction::package, this, [trans](PackageKit::Transaction::Info info, const QString &packageID){ | ||
| 196 | if (info == PackageKit::Transaction::InfoInstalled) | 236 | if (info == PackageKit::Transaction::InfoInstalled) | ||
| 197 | trans->setProperty("installedPackage", packageID); | 237 | trans->setProperty("installedPackage", packageID); | ||
| 198 | }); | 238 | }); | ||
| 199 | connect(trans, &PackageKit::Transaction::finished, this, [this, trans, component](PackageKit::Transaction::Exit status) { | 239 | connect(trans, &PackageKit::Transaction::finished, this, [this, trans, component](PackageKit::Transaction::Exit status) { | ||
| 200 | const auto pkgidVal = trans->property("installedPackage"); | 240 | const auto pkgidVal = trans->property("installedPackage"); | ||
| 201 | if (status == PackageKit::Transaction::ExitSuccess && !pkgidVal.isNull()) { | 241 | if (status == PackageKit::Transaction::ExitSuccess && !pkgidVal.isNull()) { | ||
| 202 | const auto pkgid = pkgidVal.toString(); | 242 | const auto pkgid = pkgidVal.toString(); | ||
| 203 | auto res = addComponent(component, {PackageKit::Daemon::packageName(pkgid)}); | 243 | auto res = addComponent(component, {PackageKit::Daemon::packageName(pkgid)}); | ||
| 204 | res->clearPackageIds(); | 244 | res->clearPackageIds(); | ||
| 205 | res->addPackageId(PackageKit::Transaction::InfoInstalled, pkgid, true); | 245 | res->addPackageId(PackageKit::Transaction::InfoInstalled, pkgid, true); | ||
| 206 | } | 246 | } | ||
| 207 | acquireFetching(false); | 247 | acquireFetching(false); | ||
| 208 | }); | 248 | }); | ||
| 209 | continue; | | |||
| 210 | } | | |||
| 211 | } | | |||
| 212 | | ||||
| 213 | qCDebug(LIBDISCOVER_BACKEND_LOG) << "no packages for" << component.id(); | | |||
| 214 | continue; | | |||
| 215 | } | | |||
| 216 | neededPackages += pkgNames; | | |||
| 217 | | ||||
| 218 | addComponent(component, pkgNames); | | |||
| 219 | } | 249 | } | ||
| 220 | 250 | | |||
| 221 | acquireFetching(false); | | |||
| 222 | if (!neededPackages.isEmpty()) { | 251 | if (!neededPackages.isEmpty()) { | ||
| 223 | neededPackages.removeDuplicates(); | 252 | neededPackages.removeDuplicates(); | ||
| 224 | resolvePackages(neededPackages); | 253 | resolvePackages(neededPackages); | ||
| 225 | } else { | 254 | } else { | ||
| 226 | qCDebug(LIBDISCOVER_BACKEND_LOG) << "empty appstream db"; | 255 | qCDebug(LIBDISCOVER_BACKEND_LOG) << "empty appstream db"; | ||
| 227 | if (PackageKit::Daemon::backendName() == QLatin1String("aptcc") || PackageKit::Daemon::backendName().isEmpty()) { | 256 | if (PackageKit::Daemon::backendName() == QLatin1String("aptcc") || PackageKit::Daemon::backendName().isEmpty()) { | ||
| 228 | checkForUpdates(); | 257 | checkForUpdates(); | ||
| 229 | } | 258 | } | ||
| 230 | } | 259 | } | ||
| 260 | acquireFetching(false); | ||||
| 261 | if (!m_appstreamInitialized) { | ||||
| 262 | m_appstreamInitialized = true; | ||||
| 263 | Q_EMIT loadedAppStream(); | ||||
| 264 | } | ||||
| 265 | }); | ||||
| 266 | fw->setFuture(QtConcurrent::run(&m_threadPool, &loadAppStream, m_appdata.get())); | ||||
| 231 | } | 267 | } | ||
| 232 | 268 | | |||
| 233 | AppPackageKitResource* PackageKitBackend::addComponent(const AppStream::Component& component, const QStringList& pkgNames) | 269 | AppPackageKitResource* PackageKitBackend::addComponent(const AppStream::Component& component, const QStringList& pkgNames) | ||
| 234 | { | 270 | { | ||
| 235 | Q_ASSERT(isFetching()); | 271 | Q_ASSERT(isFetching()); | ||
| 236 | Q_ASSERT(!pkgNames.isEmpty()); | 272 | Q_ASSERT(!pkgNames.isEmpty()); | ||
| 237 | 273 | | |||
| 238 | 274 | | |||
| ▲ Show 20 Lines • Show All 174 Lines • ▼ Show 20 Line(s) | 440 | if (!m_refresher) { | |||
| 413 | }); | 449 | }); | ||
| 414 | } else { | 450 | } else { | ||
| 415 | qWarning() << "already resetting"; | 451 | qWarning() << "already resetting"; | ||
| 416 | } | 452 | } | ||
| 417 | } | 453 | } | ||
| 418 | 454 | | |||
| 419 | QList<AppStream::Component> PackageKitBackend::componentsById(const QString& id) const | 455 | QList<AppStream::Component> PackageKitBackend::componentsById(const QString& id) const | ||
| 420 | { | 456 | { | ||
| 457 | Q_ASSERT(m_appstreamInitialized); | ||||
| 421 | return m_appdata->componentsById(id); | 458 | return m_appdata->componentsById(id); | ||
| 422 | } | 459 | } | ||
| 423 | 460 | | |||
| 424 | ResultsStream* PackageKitBackend::search(const AbstractResourcesBackend::Filters& filter) | 461 | ResultsStream* PackageKitBackend::search(const AbstractResourcesBackend::Filters& filter) | ||
| 425 | { | 462 | { | ||
| 426 | if (!filter.resourceUrl.isEmpty()) { | 463 | if (!filter.resourceUrl.isEmpty()) { | ||
| 427 | return findResourceByPackageName(filter.resourceUrl); | 464 | return findResourceByPackageName(filter.resourceUrl); | ||
| 428 | } else if (!filter.extends.isEmpty()) { | 465 | } else if (!filter.extends.isEmpty()) { | ||
| 429 | const auto ext = kTransform<QVector<AbstractResource*>>(m_packages.extendedBy.value(filter.extends), [](AppPackageKitResource* a){ return a; }); | 466 | const auto ext = kTransform<QVector<AbstractResource*>>(m_packages.extendedBy.value(filter.extends), [](AppPackageKitResource* a){ return a; }); | ||
| 430 | return new ResultsStream(QStringLiteral("PackageKitStream-extends"), ext); | 467 | return new ResultsStream(QStringLiteral("PackageKitStream-extends"), ext); | ||
| 431 | } else if (filter.search.isEmpty()) { | 468 | } else if (filter.search.isEmpty()) { | ||
| 432 | return new ResultsStream(QStringLiteral("PackageKitStream-all"), kFilter<QVector<AbstractResource*>>(m_packages.packages, [](AbstractResource* res) { return res->type() != AbstractResource::Technical && !qobject_cast<PackageKitResource*>(res)->extendsItself(); })); | 469 | return new ResultsStream(QStringLiteral("PackageKitStream-all"), kFilter<QVector<AbstractResource*>>(m_packages.packages, [](AbstractResource* res) { return res->type() != AbstractResource::Technical && !qobject_cast<PackageKitResource*>(res)->extendsItself(); })); | ||
| 433 | } else { | 470 | } else { | ||
| 471 | auto stream = new ResultsStream(QStringLiteral("PackageKitStream-search")); | ||||
| 472 | const auto f = [this, stream, filter] () { | ||||
| 434 | const QList<AppStream::Component> components = m_appdata->search(filter.search); | 473 | const QList<AppStream::Component> components = m_appdata->search(filter.search); | ||
| 435 | const QStringList ids = kTransform<QStringList>(components, [](const AppStream::Component& comp) { return comp.id(); }); | 474 | const QStringList ids = kTransform<QStringList>(components, [](const AppStream::Component& comp) { return comp.id(); }); | ||
| 436 | auto stream = new ResultsStream(QStringLiteral("PackageKitStream-search")); | | |||
| 437 | if (!ids.isEmpty()) { | 475 | if (!ids.isEmpty()) { | ||
| 438 | const auto resources = kFilter<QVector<AbstractResource*>>(resourcesByPackageNames<QVector<AbstractResource*>>(ids), [](AbstractResource* res){ return !qobject_cast<PackageKitResource*>(res)->extendsItself(); }); | 476 | const auto resources = kFilter<QVector<AbstractResource*>>(resourcesByPackageNames<QVector<AbstractResource*>>(ids), [](AbstractResource* res){ return !qobject_cast<PackageKitResource*>(res)->extendsItself(); }); | ||
| 439 | QTimer::singleShot(0, this, [stream, resources] () { | 477 | QTimer::singleShot(0, this, [stream, resources] () { | ||
| 440 | Q_EMIT stream->resourcesFound(resources); | 478 | Q_EMIT stream->resourcesFound(resources); | ||
| 441 | }); | 479 | }); | ||
| 442 | } | 480 | } | ||
| 443 | 481 | | |||
| 444 | PackageKit::Transaction * tArch = PackageKit::Daemon::resolve(filter.search, PackageKit::Transaction::FilterArch); | 482 | PackageKit::Transaction * tArch = PackageKit::Daemon::resolve(filter.search, PackageKit::Transaction::FilterArch); | ||
| 445 | connect(tArch, &PackageKit::Transaction::package, this, &PackageKitBackend::addPackageArch); | 483 | connect(tArch, &PackageKit::Transaction::package, this, &PackageKitBackend::addPackageArch); | ||
| 446 | connect(tArch, &PackageKit::Transaction::package, stream, [stream](PackageKit::Transaction::Info /*info*/, const QString &packageId){ | 484 | connect(tArch, &PackageKit::Transaction::package, stream, [stream](PackageKit::Transaction::Info /*info*/, const QString &packageId){ | ||
| 447 | stream->setProperty("packageId", packageId); | 485 | stream->setProperty("packageId", packageId); | ||
| 448 | }); | 486 | }); | ||
| 449 | connect(tArch, &PackageKit::Transaction::finished, stream, [stream, ids, this](PackageKit::Transaction::Exit status) { | 487 | connect(tArch, &PackageKit::Transaction::finished, stream, [stream, ids, this](PackageKit::Transaction::Exit status) { | ||
| 450 | getPackagesFinished(); | 488 | getPackagesFinished(); | ||
| 451 | if (status == PackageKit::Transaction::Exit::ExitSuccess) { | 489 | if (status == PackageKit::Transaction::Exit::ExitSuccess) { | ||
| 452 | const auto packageId = stream->property("packageId"); | 490 | const auto packageId = stream->property("packageId"); | ||
| 453 | if (!packageId.isNull()) { | 491 | if (!packageId.isNull()) { | ||
| 454 | const auto res = resourcesByPackageNames<QVector<AbstractResource*>>({PackageKit::Daemon::packageName(packageId.toString())}); | 492 | const auto res = resourcesByPackageNames<QVector<AbstractResource*>>({PackageKit::Daemon::packageName(packageId.toString())}); | ||
| 455 | Q_EMIT stream->resourcesFound(kFilter<QVector<AbstractResource*>>(res, [ids](AbstractResource* res){ return !ids.contains(res->appstreamId()); })); | 493 | Q_EMIT stream->resourcesFound(kFilter<QVector<AbstractResource*>>(res, [ids](AbstractResource* res){ return !ids.contains(res->appstreamId()); })); | ||
| 456 | } | 494 | } | ||
| 457 | } | 495 | } | ||
| 458 | stream->finish(); | 496 | stream->finish(); | ||
| 459 | }, Qt::QueuedConnection); | 497 | }, Qt::QueuedConnection); | ||
| 498 | }; | ||||
| 499 | if (!m_appstreamInitialized) { | ||||
| 500 | connect(this, &PackageKitBackend::loadedAppStream, stream, f); | ||||
| 501 | } else { | ||||
| 502 | QTimer::singleShot(0, this, f); | ||||
broulik: Why is this delayed now? | |||||
It's a quirk of how ResultsStream works. We need the results to be emitted when something is listening to it. If you look at it closely, it was already done before. I'll remove the other delay. apol: It's a quirk of how ResultsStream works. We need the results to be emitted when something is… | |||||
| 503 | } | ||||
| 460 | return stream; | 504 | return stream; | ||
| 461 | } | 505 | } | ||
| 462 | } | 506 | } | ||
| 463 | 507 | | |||
| 464 | ResultsStream * PackageKitBackend::findResourceByPackageName(const QUrl& url) | 508 | ResultsStream * PackageKitBackend::findResourceByPackageName(const QUrl& url) | ||
| 465 | { | 509 | { | ||
| 466 | AbstractResource* pkg = nullptr; | | |||
| 467 | if (url.isLocalFile()) { | 510 | if (url.isLocalFile()) { | ||
| 468 | QMimeDatabase db; | 511 | QMimeDatabase db; | ||
| 469 | const auto mime = db.mimeTypeForUrl(url); | 512 | const auto mime = db.mimeTypeForUrl(url); | ||
| 470 | if ( mime.inherits(QStringLiteral("application/vnd.debian.binary-package")) | 513 | if ( mime.inherits(QStringLiteral("application/vnd.debian.binary-package")) | ||
| 471 | || mime.inherits(QStringLiteral("application/x-rpm")) | 514 | || mime.inherits(QStringLiteral("application/x-rpm")) | ||
| 472 | || mime.inherits(QStringLiteral("application/x-tar")) | 515 | || mime.inherits(QStringLiteral("application/x-tar")) | ||
| 473 | || mime.inherits(QStringLiteral("application/x-xz-compressed-tar")) | 516 | || mime.inherits(QStringLiteral("application/x-xz-compressed-tar")) | ||
| 474 | ) { | 517 | ) { | ||
| 475 | pkg = new LocalFilePKResource(url, this); | 518 | return new ResultsStream(QStringLiteral("PackageKitStream-localpkg"), QVector<AbstractResource*>{ new LocalFilePKResource(url, this)}); | ||
| 476 | } | 519 | } | ||
| 477 | } else if (url.scheme() == QLatin1String("appstream")) { | 520 | } else if (url.scheme() == QLatin1String("appstream")) { | ||
| 478 | static const QMap<QString, QString> deprecatedAppstreamIds = { | 521 | static const QMap<QString, QString> deprecatedAppstreamIds = { | ||
| 479 | { QStringLiteral("org.kde.krita.desktop"), QStringLiteral("krita.desktop") }, | 522 | { QStringLiteral("org.kde.krita.desktop"), QStringLiteral("krita.desktop") }, | ||
| 480 | { QStringLiteral("org.kde.digikam.desktop"), QStringLiteral("digikam.desktop") }, | 523 | { QStringLiteral("org.kde.digikam.desktop"), QStringLiteral("digikam.desktop") }, | ||
| 481 | { QStringLiteral("org.kde.ktorrent.desktop"), QStringLiteral("ktorrent.desktop") }, | 524 | { QStringLiteral("org.kde.ktorrent.desktop"), QStringLiteral("ktorrent.desktop") }, | ||
| 482 | { QStringLiteral("org.kde.gcompris.desktop"), QStringLiteral("gcompris.desktop") }, | 525 | { QStringLiteral("org.kde.gcompris.desktop"), QStringLiteral("gcompris.desktop") }, | ||
| 483 | { QStringLiteral("org.kde.kmymoney.desktop"), QStringLiteral("kmymoney.desktop") }, | 526 | { QStringLiteral("org.kde.kmymoney.desktop"), QStringLiteral("kmymoney.desktop") }, | ||
| 484 | { QStringLiteral("org.kde.kolourpaint.desktop"), QStringLiteral("kolourpaint.desktop") }, | 527 | { QStringLiteral("org.kde.kolourpaint.desktop"), QStringLiteral("kolourpaint.desktop") }, | ||
| 485 | { QStringLiteral("org.blender.blender.desktop"), QStringLiteral("blender.desktop") }, | 528 | { QStringLiteral("org.blender.blender.desktop"), QStringLiteral("blender.desktop") }, | ||
| 486 | }; | 529 | }; | ||
| 487 | 530 | | |||
| 488 | const auto appstreamId = AppStreamUtils::appstreamId(url); | 531 | const auto appstreamId = AppStreamUtils::appstreamId(url); | ||
| 489 | if (appstreamId.isEmpty()) | 532 | if (appstreamId.isEmpty()) | ||
| 490 | Q_EMIT passiveMessage(i18n("Malformed appstream url '%1'", url.toDisplayString())); | 533 | Q_EMIT passiveMessage(i18n("Malformed appstream url '%1'", url.toDisplayString())); | ||
| 491 | else { | 534 | else { | ||
| 535 | auto stream = new ResultsStream(QStringLiteral("PackageKitStream-appstream-url")); | ||||
| 536 | const auto f = [this, appstreamId, stream] () { | ||||
| 537 | AbstractResource* pkg = nullptr; | ||||
| 492 | const auto deprecatedHost = deprecatedAppstreamIds.value(appstreamId); //try this as fallback | 538 | const auto deprecatedHost = deprecatedAppstreamIds.value(appstreamId); //try this as fallback | ||
| 493 | for (auto it = m_packages.packages.constBegin(), itEnd = m_packages.packages.constEnd(); it != itEnd; ++it) { | 539 | for (auto it = m_packages.packages.constBegin(), itEnd = m_packages.packages.constEnd(); it != itEnd; ++it) { | ||
| 494 | if (it.key().compare(appstreamId, Qt::CaseInsensitive) == 0 | 540 | if (it.key().compare(appstreamId, Qt::CaseInsensitive) == 0 | ||
| 495 | || it.key().compare(deprecatedHost, Qt::CaseInsensitive) == 0 | 541 | || it.key().compare(deprecatedHost, Qt::CaseInsensitive) == 0 | ||
| 496 | || (appstreamId.endsWith(QLatin1String(".desktop")) && appstreamId.compare(it.key()+QLatin1String(".desktop"), Qt::CaseInsensitive) == 0)) { | 542 | || (appstreamId.endsWith(QLatin1String(".desktop")) && appstreamId.compare(it.key()+QLatin1String(".desktop"), Qt::CaseInsensitive) == 0)) { | ||
| 497 | pkg = it.value(); | 543 | pkg = it.value(); | ||
| 498 | break; | 544 | break; | ||
| 499 | } | 545 | } | ||
| 500 | } | 546 | } | ||
| 547 | if (pkg) | ||||
| 548 | Q_EMIT stream->resourcesFound({pkg}); | ||||
| 549 | stream->finish(); | ||||
| 501 | // if (!pkg) | 550 | // if (!pkg) | ||
| 502 | // qCDebug(LIBDISCOVER_BACKEND_LOG) << "could not find" << host << deprecatedHost; | 551 | // qCDebug(LIBDISCOVER_BACKEND_LOG) << "could not find" << host << deprecatedHost; | ||
| 552 | }; | ||||
| 553 | if (!m_appstreamInitialized) { | ||||
| 554 | connect(this, &PackageKitBackend::loadedAppStream, stream, f); | ||||
| 555 | } else { | ||||
| 556 | QTimer::singleShot(0, this, f); | ||||
| 557 | } | ||||
| 558 | return stream; | ||||
| 503 | } | 559 | } | ||
| 504 | } | 560 | } | ||
| 505 | return new ResultsStream(QStringLiteral("PackageKitStream-url"), pkg ? QVector<AbstractResource*>{pkg} : QVector<AbstractResource*>{}); | 561 | return new ResultsStream(QStringLiteral("PackageKitStream-unknown-url"), {}); | ||
| 506 | } | 562 | } | ||
| 507 | 563 | | |||
| 508 | bool PackageKitBackend::hasSecurityUpdates() const | 564 | bool PackageKitBackend::hasSecurityUpdates() const | ||
| 509 | { | 565 | { | ||
| 510 | return m_hasSecurityUpdates; | 566 | return m_hasSecurityUpdates; | ||
| 511 | } | 567 | } | ||
| 512 | 568 | | |||
| 513 | int PackageKitBackend::updatesCount() const | 569 | int PackageKitBackend::updatesCount() const | ||
| ▲ Show 20 Lines • Show All 176 Lines • Show Last 20 Lines | |||||
Coding style ..