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
1305ba64
Commit
1305ba64
authored
Jan 29, 2018
by
Aleix Pol Gonzalez
🐧
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Package names into appstream resources before showing an update count
BUG: 389108
parent
c828cc67
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
+5
-5
libdiscover/backends/PackageKitBackend/PackageKitBackend.h
libdiscover/backends/PackageKitBackend/PackageKitBackend.h
+2
-2
No files found.
libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
View file @
1305ba64
...
...
@@ -298,11 +298,11 @@ void PackageKitBackend::packageDetails(const PackageKit::Details& details)
QSet
<
AbstractResource
*>
PackageKitBackend
::
resourcesByPackageName
(
const
QString
&
name
)
const
{
return
resourcesByPackageNames
<
QSet
<
AbstractResource
*>>
({
name
});
return
resourcesByPackageNames
<
QSet
<
AbstractResource
*>
,
QVector
<
QString
>
>
({
name
});
}
template
<
typename
T
>
T
PackageKitBackend
::
resourcesByPackageNames
(
const
Q
StringList
&
pkgnames
)
const
template
<
typename
T
,
typename
Q
>
T
PackageKitBackend
::
resourcesByPackageNames
(
const
Q
&
pkgnames
)
const
{
T
ret
;
ret
.
reserve
(
pkgnames
.
size
());
...
...
@@ -367,7 +367,7 @@ ResultsStream* PackageKitBackend::search(const AbstractResourcesBackend::Filters
if
(
status
==
PackageKit
::
Transaction
::
Exit
::
ExitSuccess
)
{
const
auto
packageId
=
stream
->
property
(
"packageId"
);
if
(
!
packageId
.
isNull
())
{
const
auto
res
=
resourcesByPackageNames
<
QVector
<
AbstractResource
*>>
({
PackageKit
::
Daemon
::
packageName
(
packageId
.
toString
())});
const
auto
res
=
resourcesByPackageNames
<
QVector
<
AbstractResource
*>
,
QVector
<
QString
>
>
({
PackageKit
::
Daemon
::
packageName
(
packageId
.
toString
())});
stream
->
resourcesFound
(
kFilter
<
QVector
<
AbstractResource
*>>
(
res
,
[
ids
](
AbstractResource
*
res
){
return
!
ids
.
contains
(
res
->
appstreamId
());
}));
}
}
...
...
@@ -403,7 +403,7 @@ bool PackageKitBackend::hasSecurityUpdates() const
int
PackageKitBackend
::
updatesCount
()
const
{
return
m_updatesPackageId
.
count
();
return
resourcesByPackageNames
<
QSet
<
AbstractResource
*>>
(
m_updatesPackageId
)
.
count
();
}
Transaction
*
PackageKitBackend
::
installApplication
(
AbstractResource
*
app
,
const
AddonList
&
addons
)
...
...
libdiscover/backends/PackageKitBackend/PackageKitBackend.h
View file @
1305ba64
...
...
@@ -90,8 +90,8 @@ class DISCOVERCOMMON_EXPORT PackageKitBackend : public AbstractResourcesBackend
void
getUpdatesDetailsFinished
(
PackageKit
::
Transaction
::
Exit
,
uint
);
private:
template
<
typename
T
>
T
resourcesByPackageNames
(
const
Q
StringList
&
names
)
const
;
template
<
typename
T
,
typename
Q
>
T
resourcesByPackageNames
(
const
Q
&
names
)
const
;
void
fetchUpdates
();
void
checkDaemonRunning
();
...
...
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