Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Discover
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Plasma
Discover
Commits
e070b126
Commit
e070b126
authored
Dec 11, 2017
by
Aleix Pol Gonzalez
🐧
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Have backends provide the update size
BUG: 387698
parent
3d4b1b8b
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
42 additions
and
6 deletions
+42
-6
libdiscover/UpdateModel/UpdateModel.cpp
libdiscover/UpdateModel/UpdateModel.cpp
+1
-6
libdiscover/backends/PackageKitBackend/PackageKitUpdater.cpp
libdiscover/backends/PackageKitBackend/PackageKitUpdater.cpp
+15
-0
libdiscover/backends/PackageKitBackend/PackageKitUpdater.h
libdiscover/backends/PackageKitBackend/PackageKitUpdater.h
+1
-0
libdiscover/resources/AbstractBackendUpdater.h
libdiscover/resources/AbstractBackendUpdater.h
+5
-0
libdiscover/resources/ResourcesUpdatesModel.cpp
libdiscover/resources/ResourcesUpdatesModel.cpp
+9
-0
libdiscover/resources/ResourcesUpdatesModel.h
libdiscover/resources/ResourcesUpdatesModel.h
+1
-0
libdiscover/resources/StandardBackendUpdater.cpp
libdiscover/resources/StandardBackendUpdater.cpp
+9
-0
libdiscover/resources/StandardBackendUpdater.h
libdiscover/resources/StandardBackendUpdater.h
+1
-0
No files found.
libdiscover/UpdateModel/UpdateModel.cpp
View file @
e070b126
...
...
@@ -253,12 +253,7 @@ UpdateItem * UpdateModel::itemFromResource(AbstractResource* res)
QString
UpdateModel
::
updateSize
()
const
{
double
ret
=
0
;
foreach
(
UpdateItem
*
item
,
m_updateItems
)
{
if
(
item
->
checked
()
==
Qt
::
Checked
)
ret
+=
item
->
size
();
}
return
KFormat
().
formatByteSize
(
ret
);
return
KFormat
().
formatByteSize
(
m_updates
->
updateSize
());
}
QModelIndex
UpdateModel
::
indexFromItem
(
UpdateItem
*
item
)
const
...
...
libdiscover/backends/PackageKitBackend/PackageKitUpdater.cpp
View file @
e070b126
...
...
@@ -376,3 +376,18 @@ void PackageKitUpdater::repoSignatureRequired(const QString& packageID, const QS
return
PackageKit
::
Daemon
::
installSignature
(
type
,
keyId
,
packageID
);
};
}
double
PackageKitUpdater
::
updateSize
()
const
{
double
ret
=
0.
;
QSet
<
QString
>
donePkgs
;
for
(
AbstractResource
*
res
:
m_toUpgrade
)
{
PackageKitResource
*
app
=
qobject_cast
<
PackageKitResource
*>
(
res
);
QString
pkgid
=
m_backend
->
upgradeablePackageId
(
app
);
if
(
!
donePkgs
.
contains
(
pkgid
))
{
donePkgs
.
insert
(
pkgid
);
ret
+=
app
->
size
();
}
}
return
ret
;
}
libdiscover/backends/PackageKitBackend/PackageKitUpdater.h
View file @
e070b126
...
...
@@ -46,6 +46,7 @@ class PackageKitUpdater : public AbstractBackendUpdater
bool
isCancelable
()
const
override
;
bool
isProgressing
()
const
override
;
void
fetchChangelog
()
const
override
;
double
updateSize
()
const
override
;
void
proceed
()
override
;
...
...
libdiscover/resources/AbstractBackendUpdater.h
View file @
e070b126
...
...
@@ -118,6 +118,11 @@ class DISCOVERCOMMON_EXPORT AbstractBackendUpdater : public QObject
virtual
void
fetchChangelog
()
const
;
/**
* @returns the size of all the packages set to update combined
*/
virtual
double
updateSize
()
const
=
0
;
public
Q_SLOTS
:
/**
* If \isCancelable is true during the transaction, this method has
...
...
libdiscover/resources/ResourcesUpdatesModel.cpp
View file @
e070b126
...
...
@@ -236,6 +236,15 @@ QDateTime ResourcesUpdatesModel::lastUpdate() const
return
ret
;
}
double
ResourcesUpdatesModel
::
updateSize
()
const
{
double
ret
;
for
(
AbstractBackendUpdater
*
upd
:
m_updaters
)
{
ret
+=
upd
->
updateSize
();
}
return
ret
;
}
qint64
ResourcesUpdatesModel
::
secsToLastUpdate
()
const
{
return
lastUpdate
().
secsTo
(
QDateTime
::
currentDateTime
());
...
...
libdiscover/resources/ResourcesUpdatesModel.h
View file @
e070b126
...
...
@@ -51,6 +51,7 @@ class DISCOVERCOMMON_EXPORT ResourcesUpdatesModel : public QStandardItemModel
bool
isProgressing
()
const
;
QList
<
AbstractResource
*>
toUpdate
()
const
;
QDateTime
lastUpdate
()
const
;
double
updateSize
()
const
;
void
addResources
(
const
QList
<
AbstractResource
*>&
resources
);
void
removeResources
(
const
QList
<
AbstractResource
*>&
resources
);
...
...
libdiscover/resources/StandardBackendUpdater.cpp
View file @
e070b126
...
...
@@ -206,3 +206,12 @@ bool StandardBackendUpdater::isProgressing() const
{
return
m_settingUp
||
!
m_pendingResources
.
isEmpty
();
}
double
StandardBackendUpdater
::
updateSize
()
const
{
double
ret
=
0.
;
for
(
AbstractResource
*
res
:
m_toUpgrade
)
{
ret
+=
res
->
size
();
}
return
ret
;
}
libdiscover/resources/StandardBackendUpdater.h
View file @
e070b126
...
...
@@ -47,6 +47,7 @@ class DISCOVERCOMMON_EXPORT StandardBackendUpdater : public AbstractBackendUpdat
bool
isCancelable
()
const
override
;
bool
isProgressing
()
const
override
;
bool
isMarked
(
AbstractResource
*
res
)
const
override
;
double
updateSize
()
const
override
;
void
setProgress
(
qreal
p
);
int
updatesCount
()
const
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment