[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [discover/Plasma/5.13] libdiscover/backends: Merge branch 'Plasma/5.12' into Plasma/5.13
From:       Aleix Pol <null () kde ! org>
Date:       2018-05-31 1:48:00
Message-ID: E1fOCh6-00032x-9f () code ! kde ! org
[Download RAW message or body]

Git commit 5d6f63846c1f78c9d6e1fb11c0dc97607b0478b0 by Aleix Pol.
Committed on 31/05/2018 at 01:47.
Pushed by apol into branch 'Plasma/5.13'.

Merge branch 'Plasma/5.12' into Plasma/5.13

M  +3    -3    libdiscover/backends/FlatpakBackend/FlatpakBackend.cpp
M  +0    -17   libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
M  +1    -1    libdiscover/backends/PackageKitBackend/PackageKitBackend.h
M  +28   -3    libdiscover/backends/PackageKitBackend/PackageKitResource.cpp
M  +7    -2    libdiscover/backends/PackageKitBackend/PackageKitResource.h

https://commits.kde.org/discover/5d6f63846c1f78c9d6e1fb11c0dc97607b0478b0

diff --cc libdiscover/backends/PackageKitBackend/PackageKitResource.cpp
index fe7993dc,ac48d3eb..38c2b571
--- a/libdiscover/backends/PackageKitBackend/PackageKitResource.cpp
+++ b/libdiscover/backends/PackageKitBackend/PackageKitResource.cpp
@@@ -260,7 -267,20 +267,25 @@@ QString PackageKitResource::sizeDescrip
          return i18np("%2 (plus %1 dependency)", "%2 (plus %1 dependencies)", \
m_dependenciesCount, AbstractResource::sizeDescription());  }
  
 +QString PackageKitResource::sourceIcon() const
 +{
 +    return QStringLiteral("package-available");
 +}
++
+ void PackageKitResource::fetchDependencies()
+ {
+     const auto id = availablePackageId();
+     if (id.isEmpty())
+         return;
+     m_dependenciesCount = 0;
+ 
+     QSharedPointer<QJsonObject> packageDependencies(new QJsonObject);
+     auto trans = PackageKit::Daemon::installPackage(id, \
PackageKit::Transaction::TransactionFlagSimulate); +     connect(trans, \
&PackageKit::Transaction::errorCode, backend(), \
&PackageKitBackend::transactionError); +     connect(trans, \
&PackageKit::Transaction::package, this, \
[packageDependencies](PackageKit::Transaction::Info info, const QString &packageID, \
const QString &summary) { +         \
(*packageDependencies)[PackageKit::Daemon::packageName(packageID)] = summary ; +     \
}); +     connect(trans, &PackageKit::Transaction::finished, this, [this, \
packageDependencies](PackageKit::Transaction::Exit status) { +         Q_EMIT \
dependenciesFound(*packageDependencies); +     });
+ }
diff --cc libdiscover/backends/PackageKitBackend/PackageKitResource.h
index 02382d17,19a92f03..2227aeee
--- a/libdiscover/backends/PackageKitBackend/PackageKitResource.h
+++ b/libdiscover/backends/PackageKitBackend/PackageKitResource.h
@@@ -67,12 -67,11 +67,15 @@@ class PackageKitResource : public Abstr
          bool canExecute() const override { return false; }
  
          QString sizeDescription() override;
-         void setDependenciesCount(uint count);
+         void setDependenciesCount(int count);
+ 
+     Q_SIGNALS:
+         void dependenciesFound(const QJsonObject& dependencies);
  
 +        QString sourceIcon() const override;
 +
 +        QDate releaseDate() const override { return {}; }
 +
      public Q_SLOTS:
          void addPackageId(PackageKit::Transaction::Info info, const QString \
&packageId, bool arch);  void setDetails(const PackageKit::Details& details);


[prev in list] [next in list] [prev in thread] [next in thread]