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

List:       kde-commits
Subject:    [discover] libdiscover/backends/PackageKitBackend: PK: Improve changelog for appstream applications
From:       Aleix Pol <null () kde ! org>
Date:       2018-08-06 23:38:08
Message-ID: E1fmp4i-0000nL-Fd () code ! kde ! org
[Download RAW message or body]

Git commit 4b1c55098170ea23a2ef847c40b306486edcaa22 by Aleix Pol.
Committed on 06/08/2018 at 23:36.
Pushed by apol into branch 'master'.

PK: Improve changelog for appstream applications

It seems like expecting developers to offer a proper changelog is a lot
to ask. At least show something so the user isn't on his own to see
what's happening.

BUG: 397201

M  +2    -2    libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp
M  +1    -1    libdiscover/backends/PackageKitBackend/AppPackageKitResource.h
M  +1    -1    libdiscover/backends/PackageKitBackend/PackageKitResource.cpp
M  +2    -0    libdiscover/backends/PackageKitBackend/PackageKitResource.h

https://commits.kde.org/discover/4b1c55098170ea23a2ef847c40b306486edcaa22

diff --git a/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp \
b/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp index \
                16db9429..47715ad3 100644
--- a/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp
+++ b/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp
@@ -199,9 +199,9 @@ QStringList AppPackageKitResource::extends() const
     return m_appdata.extends();
 }
 
-void AppPackageKitResource::fetchChangelog()
+QString AppPackageKitResource::changelog() const
 {
-    emit changelogFetched(AppStreamUtils::changelogToHtml(m_appdata));
+    return AppStreamUtils::changelogToHtml(m_appdata);
 }
 
 void AppPackageKitResource::invokeApplication() const
diff --git a/libdiscover/backends/PackageKitBackend/AppPackageKitResource.h \
b/libdiscover/backends/PackageKitBackend/AppPackageKitResource.h index \
                d510fc79..9d6e4b71 100644
--- a/libdiscover/backends/PackageKitBackend/AppPackageKitResource.h
+++ b/libdiscover/backends/PackageKitBackend/AppPackageKitResource.h
@@ -48,10 +48,10 @@ class AppPackageKitResource : public PackageKitResource
         QList<PackageState> addonsInformation() override;
         QStringList extends() const override;
         void fetchScreenshots() override;
-        void fetchChangelog() override;
         void invokeApplication() const override;
         bool canExecute() const override { return true; }
         QDate releaseDate() const override;
+        QString changelog() const override;
 
     private:
         const AppStream::Component m_appdata;
diff --git a/libdiscover/backends/PackageKitBackend/PackageKitResource.cpp \
b/libdiscover/backends/PackageKitBackend/PackageKitResource.cpp index \
                50b8339a..2d6fbc38 100644
--- a/libdiscover/backends/PackageKitBackend/PackageKitResource.cpp
+++ b/libdiscover/backends/PackageKitBackend/PackageKitResource.cpp
@@ -248,7 +248,7 @@ void PackageKitResource::updateDetail(const QString& \
/*packageID*/, const QStrin  if (!vendorUrls.isEmpty())
         addIfNotEmpty(i18n("Vendor:"), urlToLinks(vendorUrls).join(QStringLiteral(", \
")), info);  
-    emit changelogFetched(info);
+    emit changelogFetched(changelog() + info);
 }
 
 PackageKitBackend* PackageKitResource::backend() const
diff --git a/libdiscover/backends/PackageKitBackend/PackageKitResource.h \
b/libdiscover/backends/PackageKitBackend/PackageKitResource.h index \
                4e4145bb..4b738662 100644
--- a/libdiscover/backends/PackageKitBackend/PackageKitResource.h
+++ b/libdiscover/backends/PackageKitBackend/PackageKitResource.h
@@ -74,6 +74,8 @@ class PackageKitResource : public AbstractResource
 
         QDate releaseDate() const override { return {}; }
 
+        virtual QString changelog() const { return {}; }
+
     Q_SIGNALS:
         void dependenciesFound(const QJsonObject& dependencies);
 


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