Expose the resource size into the resourcesmodel

17 files changed, 23 insertions, 20 deletions

diff --git a/libmuon/UpdateModel/UpdateItem.cpp b/libmuon/UpdateModel/UpdateItem.cpp
index f213485..0ac84b3 100644
--- a/libmuon/UpdateModel/UpdateItem.cpp
+++ b/libmuon/UpdateModel/UpdateItem.cpp
@@ -171,10 +171,10 @@ qint64 UpdateItem::size() const
     int size = 0;
 
     if (itemType == ItemType::ApplicationItem) {
-        size = m_app->downloadSize();
+        size = m_app->size();
     } else if (itemType == ItemType::CategoryItem) {
         foreach (UpdateItem *item, m_children) {
-            size += item->app()->downloadSize();
+            size += item->app()->size();
         }
     }
 
diff --git a/libmuon/backends/AkabeiBackend/AkabeiResource.cpp b/libmuon/backends/AkabeiBackend/AkabeiResource.cpp
index d687f71..ea956c1 100644
--- a/libmuon/backends/AkabeiBackend/AkabeiResource.cpp
+++ b/libmuon/backends/AkabeiBackend/AkabeiResource.cpp
@@ -130,7 +130,7 @@ QUrl AkabeiResource::screenshotUrl()
     return KUrl(MuonDataSources::screenshotsSource(), "screenshot/"+packageName());
 }
         
-int AkabeiResource::downloadSize()
+int AkabeiResource::size()
 {
     return m_pkg->size();
 }
diff --git a/libmuon/backends/AkabeiBackend/AkabeiResource.h b/libmuon/backends/AkabeiBackend/AkabeiResource.h
index 2f2303b..facfdaa 100644
--- a/libmuon/backends/AkabeiBackend/AkabeiResource.h
+++ b/libmuon/backends/AkabeiBackend/AkabeiResource.h
@@ -63,7 +63,7 @@ class MUONCOMMON_EXPORT AkabeiResource : public AbstractResource
         virtual QUrl thumbnailUrl();
         virtual QUrl screenshotUrl();
         
-        virtual int downloadSize();
+        virtual int size();
         virtual QString license();
         
         virtual QString installedVersion() const;
diff --git a/libmuon/backends/ApplicationBackend/Application.cpp b/libmuon/backends/ApplicationBackend/Application.cpp
index 062da9b..03d722e 100644
--- a/libmuon/backends/ApplicationBackend/Application.cpp
+++ b/libmuon/backends/ApplicationBackend/Application.cpp
@@ -426,7 +426,7 @@ QString Application::sizeDescription()
     KFormat f;
     if (!isInstalled()) {
         return i18nc("@info app size", "%1 to download, %2 on disk",
-                              f.formatByteSize(package()->downloadSize()),
+                              f.formatByteSize(package()->size()),
                               f.formatByteSize(package()->availableInstalledSize()));
     } else {
         return i18nc("@info app size", "%1 on disk",
@@ -434,9 +434,9 @@ QString Application::sizeDescription()
     }
 }
 
-int Application::downloadSize()
+int Application::size()
 {
-    return m_package->downloadSize();
+    return m_package->size();
 }
 
 void Application::clearPackage()
diff --git a/libmuon/backends/ApplicationBackend/Application.h b/libmuon/backends/ApplicationBackend/Application.h
index 05a4b5a..0a3de3b 100644
--- a/libmuon/backends/ApplicationBackend/Application.h
+++ b/libmuon/backends/ApplicationBackend/Application.h
@@ -69,7 +69,7 @@ public:
     QString availableVersion() const;
     QString sizeDescription();
     QString origin() const;
-    int downloadSize();
+    int size();
 
     bool hasScreenshot() const { return m_sourceHasScreenshot; }
     void setHasScreenshot(bool has);
diff --git a/libmuon/backends/BodegaBackend/BodegaResource.cpp b/libmuon/backends/BodegaBackend/BodegaResource.cpp
index bb4aa68..ff9163f 100644
--- a/libmuon/backends/BodegaBackend/BodegaResource.cpp
+++ b/libmuon/backends/BodegaBackend/BodegaResource.cpp
@@ -78,7 +78,7 @@ QStringList BodegaResource::categories()
     return QStringList(assetOperations()->assetTags().value("mimetype"));
 }
 
-int BodegaResource::downloadSize()
+int BodegaResource::size()
 {
     //TODO
     return 0;
diff --git a/libmuon/backends/BodegaBackend/BodegaResource.h b/libmuon/backends/BodegaBackend/BodegaResource.h
index 6e269cd..d043127 100644
--- a/libmuon/backends/BodegaBackend/BodegaResource.h
+++ b/libmuon/backends/BodegaBackend/BodegaResource.h
@@ -49,7 +49,7 @@ class BodegaResource : public AbstractResource
         virtual QString longDescription() { return m_info.description; }
         virtual QString packageName() const { return m_info.id; }
         virtual QString license() { return m_info.license; }
-        virtual int downloadSize();
+        virtual int size();
         virtual void fetchChangelog();
         virtual QUrl screenshotUrl();
         virtual QUrl thumbnailUrl();
diff --git a/libmuon/backends/DummyBackend/DummyResource.cpp b/libmuon/backends/DummyBackend/DummyResource.cpp
index 4b528ef..ca5ddfa 100644
--- a/libmuon/backends/DummyBackend/DummyResource.cpp
+++ b/libmuon/backends/DummyBackend/DummyResource.cpp
@@ -78,7 +78,7 @@ QString DummyResource::comment()
     return "comment "+name()+"...";
 }
 
-int DummyResource::downloadSize()
+int DummyResource::size()
 {
     return 123;
 }
diff --git a/libmuon/backends/DummyBackend/DummyResource.h b/libmuon/backends/DummyBackend/DummyResource.h
index eb1e152..8129df1 100644
--- a/libmuon/backends/DummyBackend/DummyResource.h
+++ b/libmuon/backends/DummyBackend/DummyResource.h
@@ -37,7 +37,7 @@ public:
     virtual QString availableVersion() const override;
     virtual QString installedVersion() const override;
     virtual QString license() override;
-    virtual int downloadSize() override;
+    virtual int size() override;
     virtual QUrl screenshotUrl() override;
     virtual QUrl thumbnailUrl() override;
     virtual QUrl homepage() override;
diff --git a/libmuon/backends/KNSBackend/KNSResource.cpp b/libmuon/backends/KNSBackend/KNSResource.cpp
index 157ba36..8f573c5 100644
--- a/libmuon/backends/KNSBackend/KNSResource.cpp
+++ b/libmuon/backends/KNSBackend/KNSResource.cpp
@@ -140,7 +140,7 @@ QString KNSResource::license()
     return m_content.licenseName();
 }
 
-int KNSResource::downloadSize()
+int KNSResource::size()
 {
 #if KNEWSTUFF_VERSION_MINOR > 3 and KNEWSTUFF_VERSION_MAJOR == 5
     const
diff --git a/libmuon/backends/KNSBackend/KNSResource.h b/libmuon/backends/KNSBackend/KNSResource.h
index 5b4c94e..59d6bd8 100644
--- a/libmuon/backends/KNSBackend/KNSResource.h
+++ b/libmuon/backends/KNSBackend/KNSResource.h
@@ -54,7 +54,7 @@ public:
     virtual QString origin() const override;
     virtual QString section() override;
     virtual void fetchScreenshots() override;
-    virtual int downloadSize() override;
+    virtual int size() override;
     virtual void fetchChangelog() override;
 
     const Attica::Content& content();
diff --git a/libmuon/backends/PackageKitBackend/PackageKitResource.cpp b/libmuon/backends/PackageKitBackend/PackageKitResource.cpp
index ec48641..563a059 100644
--- a/libmuon/backends/PackageKitBackend/PackageKitResource.cpp
+++ b/libmuon/backends/PackageKitBackend/PackageKitResource.cpp
@@ -111,7 +111,7 @@ QString PackageKitResource::installedVersion() const
     return PackageKit::Daemon::packageVersion(installedPackageId());
 }
 
-int PackageKitResource::downloadSize()
+int PackageKitResource::size()
 {
     fetchDetails();
     return m_details.size();
diff --git a/libmuon/backends/PackageKitBackend/PackageKitResource.h b/libmuon/backends/PackageKitBackend/PackageKitResource.h
index e265bd7..1116155 100644
--- a/libmuon/backends/PackageKitBackend/PackageKitResource.h
+++ b/libmuon/backends/PackageKitBackend/PackageKitResource.h
@@ -43,7 +43,7 @@ class PackageKitResource : public AbstractResource
         virtual QString origin() const override;
         virtual QString section() override;
         virtual bool isTechnical() const override;
-        virtual int downloadSize() override;
+        virtual int size() override;
         virtual void fetchChangelog() override;
         
         virtual QList<PackageState> addonsInformation() override;
diff --git a/libmuon/resources/AbstractResource.cpp b/libmuon/resources/AbstractResource.cpp
index f9d3871..ecc7838 100644
--- a/libmuon/resources/AbstractResource.cpp
+++ b/libmuon/resources/AbstractResource.cpp
@@ -98,7 +98,7 @@ bool AbstractResource::isFromSecureOrigin() const
 
 QString AbstractResource::sizeDescription()
 {
-    return KFormat().formatByteSize(downloadSize());
+    return KFormat().formatByteSize(size());
 }
 
 QCollatorSortKey AbstractResource::nameSortKey()
diff --git a/libmuon/resources/AbstractResource.h b/libmuon/resources/AbstractResource.h
index 7a5c6c8..de8558b 100644
--- a/libmuon/resources/AbstractResource.h
+++ b/libmuon/resources/AbstractResource.h
@@ -60,6 +60,7 @@ class MUONCOMMON_EXPORT AbstractResource : public QObject
     Q_PROPERTY(QString license READ license CONSTANT)
     Q_PROPERTY(QString longDescription READ longDescription CONSTANT)
     Q_PROPERTY(QString origin READ origin CONSTANT)
+    Q_PROPERTY(int size READ size NOTIFY stateChanged)
     Q_PROPERTY(QString sizeDescription READ sizeDescription NOTIFY stateChanged)
     Q_PROPERTY(QString installedVersion READ installedVersion NOTIFY stateChanged)
     Q_PROPERTY(QString availableVersion READ availableVersion NOTIFY stateChanged)
@@ -127,7 +128,7 @@ class MUONCOMMON_EXPORT AbstractResource : public QObject
         virtual QUrl thumbnailUrl() = 0;
         virtual QUrl screenshotUrl() = 0;
 
-        virtual int downloadSize() = 0;
+        virtual int size() = 0;
         virtual QString sizeDescription();
         virtual QString license() = 0;
 
diff --git a/libmuon/resources/ResourcesModel.cpp b/libmuon/resources/ResourcesModel.cpp
index 7c3de46..45d5d94 100644
--- a/libmuon/resources/ResourcesModel.cpp
+++ b/libmuon/resources/ResourcesModel.cpp
@@ -66,7 +66,8 @@ ResourcesModel::ResourcesModel(QObject* parent, bool load)
         { IsTechnicalRole, "isTechnical" },
         { CategoryRole, "category" },
         { SectionRole, "section" },
-        { MimeTypes, "mimetypes" }
+        { MimeTypes, "mimetypes" },
+        { SizeRole, "size" }
         })
     )
 {
diff --git a/libmuon/resources/ResourcesModel.h b/libmuon/resources/ResourcesModel.h
index 9de3302..ddb1464 100644
--- a/libmuon/resources/ResourcesModel.h
+++ b/libmuon/resources/ResourcesModel.h
@@ -53,7 +53,8 @@ class MUONCOMMON_EXPORT ResourcesModel : public QAbstractListModel
             IsTechnicalRole,
             CategoryRole,
             SectionRole,
-            MimeTypes
+            MimeTypes,
+            SizeRole
         };
         /** This constructor should be only used by unit tests.
          *  @p backendName defines what backend will be loaded when the backend is constructed.