Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Akonadi Search
Commits
81e26dfe
Commit
81e26dfe
authored
Mar 11, 2022
by
Laurent Montel
Browse files
Remove old migrate code
parent
cf4436af
Pipeline
#148105
passed with stage
in 1 minute and 59 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
agent/agent.cpp
View file @
81e26dfe
...
...
@@ -308,14 +308,6 @@ void AkonadiIndexingAgent::onOnlineChanged(bool online)
// We only reindex if this is not a regular start
KConfigGroup
cfg
=
config
()
->
group
(
"General"
);
bool
aborted
=
cfg
.
readEntry
(
"aborted"
,
false
);
if
(
!
aborted
)
{
// Check baloorc which we used historically to make sure we don't
// miss the value
// TODO: Unfortunately we will hit this path in most cases
KConfig
baloorc
(
QStringLiteral
(
"baloorc"
));
KConfigGroup
baloorcgroup
=
baloorc
.
group
(
"Akonadi"
);
aborted
=
baloorcgroup
.
readEntry
(
"aborted"
,
false
);
}
if
(
aborted
)
{
cfg
.
writeEntry
(
"aborted"
,
false
);
cfg
.
sync
();
...
...
agent/scheduler.cpp
View file @
81e26dfe
...
...
@@ -51,14 +51,6 @@ Scheduler::Scheduler(Index &index, const KSharedConfigPtr &config, const QShared
KConfigGroup
cfg
=
m_config
->
group
(
"General"
);
const
auto
dirtyCollectionsResult2
=
cfg
.
readEntry
(
"dirtyCollections"
,
QList
<
Akonadi
::
Collection
::
Id
>
());
m_dirtyCollections
=
QSet
<
Akonadi
::
Collection
::
Id
>
(
dirtyCollectionsResult2
.
begin
(),
dirtyCollectionsResult2
.
end
());
if
(
m_dirtyCollections
.
isEmpty
())
{
KConfig
baloorc
(
Akonadi
::
ServerManager
::
addNamespace
(
QStringLiteral
(
"baloorc"
)));
KConfigGroup
baloorcGroup
=
baloorc
.
group
(
"Akonadi"
);
// Schedule collections we know have missing items from last time
const
auto
dirtyCollectionsResult
=
baloorcGroup
.
readEntry
(
"dirtyCollections"
,
QList
<
Akonadi
::
Collection
::
Id
>
());
m_dirtyCollections
=
QSet
<
Akonadi
::
Collection
::
Id
>
(
dirtyCollectionsResult
.
begin
(),
dirtyCollectionsResult
.
end
());
}
qCDebug
(
AKONADI_INDEXER_AGENT_LOG
)
<<
"Dirty collections "
<<
m_dirtyCollections
;
for
(
Akonadi
::
Collection
::
Id
col
:
std
::
as_const
(
m_dirtyCollections
))
{
...
...
@@ -66,13 +58,6 @@ Scheduler::Scheduler(Index &index, const KSharedConfigPtr &config, const QShared
}
bool
initialIndexingDone
=
cfg
.
readEntry
(
"initialIndexingDone"
,
false
);
if
(
!
initialIndexingDone
)
{
KConfig
baloorc
(
Akonadi
::
ServerManager
::
addNamespace
(
QStringLiteral
(
"baloorc"
)));
KConfigGroup
baloorcGroup
=
baloorc
.
group
(
"Akonadi"
);
initialIndexingDone
=
baloorcGroup
.
readEntry
(
"initialIndexingDone"
,
false
);
cfg
.
writeEntry
(
"initialIndexingDone"
,
initialIndexingDone
);
baloorcGroup
.
deleteEntry
(
"initialIndexingDone"
);
// make sure that editing akonadi_indexing_agentrc by hand works in the future
}
// Trigger a full sync initially
if
(
!
initialIndexingDone
)
{
qCDebug
(
AKONADI_INDEXER_AGENT_LOG
)
<<
"initial indexing"
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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