Differential D6191 Diff 15444 libdiscover/backends/KNSBackend/KNSBackend.cpp

Changeset View

Standalone View

View Options

libdiscover/backends/KNSBackend/KNSBackend.cpp

Context not available.
31#include <attica/providermanager.h> 31​#include <attica/providermanager.h>
32 32​
33// KDE includes 33​// KDE includes
34​#include <knewstuffcore_version.h>
34#include <KNSCore/Engine> 35​#include <KNSCore/Engine>
35#include <KNSCore/QuestionManager> 36​#include <KNSCore/QuestionManager>
36#include <KConfigGroup> 37​#include <KConfigGroup>
Context not available.
81 : AbstractResourcesBackend(parent) 82​ : AbstractResourcesBackend(parent)
82 , m_fetching(false) 83​ , m_fetching(false)
83 , m_isValid(true) 84​ , m_isValid(true)
84 , m_page(0) ​
85 , m_reviews(new KNSReviews(this)) 85​ , m_reviews(new KNSReviews(this))
86 , m_name(knsrc) 86​ , m_name(knsrc)
87 , m_iconName(iconName) 87​ , m_iconName(iconName)
Context not available.
107 107​
108 m_engine = new KNSCore::Engine(this); 108​ m_engine = new KNSCore::Engine(this);
109 m_engine->init(m_name); 109​ m_engine->init(m_name);
apolUnsubmitted
Done

Add an #if KNEWSTUFF_VERSION_MAJOR==5 && KNEWSTUFF_VERSION_MINOR==36

We always end up forgetting these fixme

apol: Add an `#if KNEWSTUFF_VERSION_MAJOR==5 && KNEWSTUFF_VERSION_MINOR==36` We always end up…
leinirAuthorUnsubmitted
Not Done

Very true, yes - to be quite frank, i forgot about the preprocessor for a moment, there ;)

leinir: Very true, yes - to be quite frank, i forgot about the preprocessor for a moment, there ;)
110​#if KNEWSTUFFCORE_VERSION_MAJOR==5 && KNEWSTUFFCORE_VERSION_MAJOR>=36
111​ m_engine->setPageSize(100);
112​#endif
110 // Setting setFetching to false when we get an error ensures we don't end up in an eternally-fetching state 113​ // Setting setFetching to false when we get an error ensures we don't end up in an eternally-fetching state
111 connect(m_engine, &KNSCore::Engine::signalError, this, [this](const QString &error) { 114​ connect(m_engine, &KNSCore::Engine::signalError, this, [this](const QString &error) {
112 if(error == QLatin1Literal("All categories are missing")) { 115​ if(error == QLatin1Literal("All categories are missing")) {
Context not available.
121 connect(m_engine, &KNSCore::Engine::signalEntriesLoaded, this, &KNSBackend::receivedEntries, Qt::QueuedConnection); 124​ connect(m_engine, &KNSCore::Engine::signalEntriesLoaded, this, &KNSBackend::receivedEntries, Qt::QueuedConnection);
122 connect(m_engine, &KNSCore::Engine::signalEntryChanged, this, &KNSBackend::statusChanged); 125​ connect(m_engine, &KNSCore::Engine::signalEntryChanged, this, &KNSBackend::statusChanged);
123 connect(m_engine, &KNSCore::Engine::signalEntryDetailsLoaded, this, &KNSBackend::statusChanged); 126​ connect(m_engine, &KNSCore::Engine::signalEntryDetailsLoaded, this, &KNSBackend::statusChanged);
124 m_page = -1; ​
125 connect(m_engine, &KNSCore::Engine::signalProvidersLoaded, m_engine, &KNSCore::Engine::checkForInstalled); 127​ connect(m_engine, &KNSCore::Engine::signalProvidersLoaded, m_engine, &KNSCore::Engine::checkForInstalled);
128​ connect(m_engine, &KNSCore::Engine::signalResetView, this, [this](){
129​ // If KNS tells us we should reset the view, what that means here is to remove
130​ // references to all the resources we've already told the agregator model about
apolUnsubmitted
Done

Good, maybe we should also delete them?
Can you see if the StandardUpdater is listening to resourceRemoved?

apol: Good, maybe we should also delete them? Can you see if the StandardUpdater is listening to…
leinirAuthorUnsubmitted
Not Done

Yes, that does seem like a good idea, if we're reasonably certain they're not accessed in other places...
StandardUpdater did not, but it does now :)

leinir: Yes, that does seem like a good idea, if we're reasonably certain they're not accessed in other…
131​ // from the model, as they will be added again...
132​ foreach(AbstractResource* res, m_resourcesByName.values()) {
133​ resourceRemoved(res);
134​ res->deleteLater();
135​ }
136​ m_resourcesByName.clear();
137​ });
126 m_responsePending = true; 138​ m_responsePending = true;
127 139​
128 const QVector<QPair<FilterType, QString>> filters = { {CategoryFilter, fileName } }; 140​ const QVector<QPair<FilterType, QString>> filters = { {CategoryFilter, fileName } };
Context not available.
191 Q_EMIT receivedResources(resources); 203​ Q_EMIT receivedResources(resources);
192 } 204​ }
193 205​
194 if(resources.isEmpty() || m_page < 0) { 206​ if(resources.isEmpty()) {
195 Q_EMIT searchFinished(); 207​ Q_EMIT searchFinished();
196 Q_EMIT availableForQueries(); 208​ Q_EMIT availableForQueries();
197 setFetching(false); 209​ setFetching(false);
198 return; 210​ return;
199 } 211​ }
200// qDebug() << "received" << objectName() << this << m_page << m_resourcesByName.count(); 212​// qDebug() << "received" << objectName() << this << m_resourcesByName.count();
201 if (!m_responsePending) { 213​ if (!m_responsePending) {
202 ++m_page; ​
203 // We _have_ to set this first. If we do not, we may run into a situation where the 214​ // We _have_ to set this first. If we do not, we may run into a situation where the
204 // data request will conclude immediately, causing m_responsePending to remain true 215​ // data request will conclude immediately, causing m_responsePending to remain true
205 // for perpetuity as the slots will be called before the function returns. 216​ // for perpetuity as the slots will be called before the function returns.
206 m_responsePending = true; 217​ m_responsePending = true;
207 m_engine->requestData(m_page, 100); 218​ m_engine->requestMoreData();
208 } else { 219​ } else {
209 Q_EMIT availableForQueries(); 220​ Q_EMIT availableForQueries();
210 } 221​ }
Context not available.
322 Q_EMIT startingSearch(); 333​ Q_EMIT startingSearch();
323 334​
324 auto stream = new ResultsStream(QStringLiteral("KNS-search-")+name()); 335​ auto stream = new ResultsStream(QStringLiteral("KNS-search-")+name());
325 auto start = [this, stream, searchText]() { 336​ connect(this, &KNSBackend::receivedResources, stream, &ResultsStream::resourcesFound);
337​ connect(this, &KNSBackend::searchFinished, stream, &ResultsStream::finish);
338​ connect(this, &KNSBackend::startingSearch, stream, &ResultsStream::finish);
339​ auto start = [this, searchText]() {
340​ // No need to explicitly launch a search, setting the search term already does that for us
326 m_engine->setSearchTerm(searchText); 341​ m_engine->setSearchTerm(searchText);
327 m_engine->requestData(0, 100); ​
328 m_responsePending = true; 342​ m_responsePending = true;
329 m_page = 0; ​
330 connect(this, &KNSBackend::receivedResources, stream, &ResultsStream::resourcesFound); ​
331 connect(this, &KNSBackend::searchFinished, stream, &ResultsStream::finish); ​
332 connect(this, &KNSBackend::startingSearch, stream, &ResultsStream::finish); ​
333 }; 343​ };
334 if (m_responsePending) { 344​ if (m_responsePending) {
335 connect(this, &KNSBackend::availableForQueries, stream, start, Qt::QueuedConnection); 345​ connect(this, &KNSBackend::availableForQueries, stream, start, Qt::QueuedConnection);
Context not available.