Differential D21721 Diff 60689 src/attica/atticaprovider.cpp

Changeset View

Standalone View

View Options

src/attica/atticaprovider.cpp

Show All 11 Lines1/*
12 Lesser General Public License for more details. 12​ Lesser General Public License for more details.
13 13​
14 You should have received a copy of the GNU Lesser General Public 14​ You should have received a copy of the GNU Lesser General Public
15 License along with this library. If not, see <http://www.gnu.org/licenses/>. 15​ License along with this library. If not, see <http://www.gnu.org/licenses/>.
16*/ 16​*/
17 17​
18#include "atticaprovider_p.h" 18​#include "atticaprovider_p.h"
19 19​
20​#include "commentsmodel.h"
20#include "question.h" 21​#include "question.h"
21#include "tagsfilterchecker.h" 22​#include "tagsfilterchecker.h"
22 23​
23#include <QCollator> 24​#include <QCollator>
24#include <knewstuffcore_debug.h> 25​#include <knewstuffcore_debug.h>
25#include <klocalizedstring.h> 26​#include <klocalizedstring.h>
26 27​
27#include <attica/providermanager.h> 28​#include <attica/providermanager.h>
Show All 16 Lines44{
44 // init categories map with invalid categories 45​ // init categories map with invalid categories
45 for (const QString &category : categories) { 46​ for (const QString &category : categories) {
46 mCategoryMap.insert(category, Attica::Category()); 47​ mCategoryMap.insert(category, Attica::Category());
47 } 48​ }
48 49​
49 connect(&m_providerManager, &ProviderManager::providerAdded, this, &AtticaProvider::providerLoaded); 50​ connect(&m_providerManager, &ProviderManager::providerAdded, this, &AtticaProvider::providerLoaded);
50 connect(&m_providerManager, SIGNAL(authenticationCredentialsMissing(Provider)), 51​ connect(&m_providerManager, SIGNAL(authenticationCredentialsMissing(Provider)),
51 SLOT(authenticationCredentialsMissing(Provider))); 52​ SLOT(authenticationCredentialsMissing(Provider)));
53​ connect(this, &Provider::loadComments, this, &AtticaProvider::loadComments);
52} 54​}
53 55​
54AtticaProvider::AtticaProvider(const Attica::Provider &provider, const QStringList &categories) 56​AtticaProvider::AtticaProvider(const Attica::Provider &provider, const QStringList &categories)
55 : mEntryJob(nullptr) 57​ : mEntryJob(nullptr)
56 , mInitialized(false) 58​ , mInitialized(false)
57{ 59​{
58 // init categories map with invalid categories 60​ // init categories map with invalid categories
59 for (const QString &category : categories) { 61​ for (const QString &category : categories) {
▲ Show 20 Lines • Show All 277 Lines • ▼ Show 20 Line(s)337 } else {
337 connect(job, &BaseJob::finished, this, &AtticaProvider::downloadItemLoaded); 339​ connect(job, &BaseJob::finished, this, &AtticaProvider::downloadItemLoaded);
338 mDownloadLinkJobs[job] = qMakePair(entry, linkId); 340​ mDownloadLinkJobs[job] = qMakePair(entry, linkId);
339 job->start(); 341​ job->start();
340 342​
341 qCDebug(KNEWSTUFFCORE) << " link for " << entry.uniqueId(); 343​ qCDebug(KNEWSTUFFCORE) << " link for " << entry.uniqueId();
342 } 344​ }
343} 345​}
344 346​
347​void AtticaProvider::loadComments(const EntryInternal &entry, int commentsPerPage, int page)
348​{
349​ ListJob<Attica::Comment> *job = m_provider.requestComments(Attica::Comment::ContentComment, entry.uniqueId(), QLatin1String("0"), page, commentsPerPage);
350​ connect(job, &BaseJob::finished, this, &AtticaProvider::loadedComments);
351​ job->start();
352​}
353​
354​QList<std::shared_ptr<KNSCore::Comment>> getCommentsList(const Attica::Comment::List &comments, KNSCore::Comment* parent = nullptr) {
ahiemstraUnsubmitted
Done

Since upstream Qt is starting to discourage usage of QList, maybe use QVector instead.

ahiemstra: Since upstream Qt is starting to discourage usage of QList, maybe use QVector instead.
leinirAuthorUnsubmitted
Done

That'd be good, except the rest of the KNewStuff API is all QList based. It'll want doing for KF6, but since QList is being deprecated for that anyway, i'm thinking we'll end up with a general QList->QVector porting effort for that time anyway, and right now it'd just be introducing a different API style for seemingly no reason... Otherwise yes :)

leinir: That'd be good, except the rest of the KNewStuff API is all QList based. It'll want doing for…
ahiemstraUnsubmitted
Done

Fair enough. I do try to make sure to use vectors as much as possible in new API, but consistency is also a good argument. :)

ahiemstra: Fair enough. I do try to make sure to use vectors as much as possible in new API, but…
leinirAuthorUnsubmitted
Done

Think i might just pop in a TODO KF6 comment... just sort of make sure that even if it ends up not being a wholesale policy, we do it here :)

leinir: Think i might just pop in a TODO KF6 comment... just sort of make sure that even if it ends up…
355​ QList<std::shared_ptr<KNSCore::Comment>> knsComments;
356​ for (const Attica::Comment &comment : comments) {
357​ qDebug() << "Appending comment with id" << comment.id() << ", which has" << comment.childCount() << "children";
358​ std::shared_ptr<KNSCore::Comment> knsComment(new KNSCore::Comment());
ahiemstraUnsubmitted
Done

Generally, it's recommended to use std::shared_ptr<KNSCore::Comment> knsComment = std::make_shared<KNSCore::Comment>(). As a bonus, that allows you to use auto knsComment.

ahiemstra: Generally, it's recommended to use `std::shared_ptr<KNSCore::Comment> knsComment = std…
leinirAuthorUnsubmitted
Done

Handy :) One of those places where i'm not opposed to auto, as it's easily read from the right hand side ;)

leinir: Handy :) One of those places where i'm not opposed to auto, as it's easily read from the right…
359​ knsComment->id = comment.id();
360​ knsComment->subject = comment.subject();
361​ knsComment->text = comment.text();
362​ knsComment->childCount = comment.childCount();
363​ knsComment->username = comment.user();
364​ knsComment->date = comment.date();
365​ knsComment->score = comment.score();
366​ knsComment->parent = parent;
367​ knsComments << knsComment;
368​ if (comment.childCount() > 0) {
369​ qDebug() << "Getting more comments, as this one has children, and we currently have this number of comments:" << knsComments.count();
ahiemstraUnsubmitted
Done

Probably better to use categorised logging for this?

ahiemstra: Probably better to use categorised logging for this?
leinirAuthorUnsubmitted
Done

Actually leftovers... but also yes :)

leinir: Actually leftovers... but also yes :)
370​ knsComments << getCommentsList(comment.children());
371​ qDebug() << "After getting the children, we now have the following number of comments:" << knsComments.count();
372​ }
373​ }
374​ return knsComments;
375​}
376​
377​void AtticaProvider::loadedComments(Attica::BaseJob *baseJob)
378​{
379​ if (!jobSuccess(baseJob)) {
380​ return;
381​ }
382​
383​ ListJob<Attica::Comment> *job = static_cast<ListJob<Attica::Comment>*>(baseJob);
384​ Attica::Comment::List comments = job->itemList();
385​
386​ QList<std::shared_ptr<KNSCore::Comment>> receivedComments = getCommentsList(comments);
387​ emit commentsLoaded(receivedComments);
388​}
389​
345void AtticaProvider::accountBalanceLoaded(Attica::BaseJob *baseJob) 390​void AtticaProvider::accountBalanceLoaded(Attica::BaseJob *baseJob)
346{ 391​{
347 if (!jobSuccess(baseJob)) { 392​ if (!jobSuccess(baseJob)) {
348 return; 393​ return;
349 } 394​ }
350 395​
351 ItemJob<AccountBalance> *job = static_cast<ItemJob<AccountBalance>*>(baseJob); 396​ ItemJob<AccountBalance> *job = static_cast<ItemJob<AccountBalance>*>(baseJob);
352 AccountBalance item = job->result(); 397​ AccountBalance item = job->result();
353 398​
354 QPair<EntryInternal, int> pair = mDownloadLinkJobs.take(job); 399​ QPair<EntryInternal, int> pair = mDownloadLinkJobs.take(job);
355 EntryInternal entry(pair.first); 400​ EntryInternal entry(pair.first);
356 Content content = mCachedContent.value(entry.uniqueId()); 401​ Content content = mCachedContent.value(entry.uniqueId());
357 if (content.downloadUrlDescription(pair.second).priceAmount() < item.balance()) { 402​ if (content.downloadUrlDescription(pair.second).priceAmount() < item.balance()) {
358 qCDebug(KNEWSTUFFCORE) << "Your balance is greater than the price." 403​ qCDebug(KNEWSTUFFCORE) << "Your balance is greater than the price."
359 << content.downloadUrlDescription(pair.second).priceAmount() << " balance: " << item.balance(); 404​ << content.downloadUrlDescription(pair.second).priceAmount() << " balance: " << item.balance();
360 Question question; 405​ Question question;
361 question.setQuestion(i18nc("the price of a download item, parameter 1 is the currency, 2 is the price", 406​ question.setQuestion(i18nc("the price of a download item, parameter 1 is the currency, 2 is the price",
362 "This item costs %1 %2.\nDo you want to buy it?", 407​ "This item costs %1 %2.\nDo you want to buy it?",
363 item.currency(), content.downloadUrlDescription(pair.second).priceAmount() 408​ item.currency(), content.downloadUrlDescription(pair.second).priceAmount()
364 )); 409​ ));
ahiemstraUnsubmitted
Done

Like above, std::make_shared<KNSCore::Author>

ahiemstra: Like above, std::make_shared<KNSCore::Author>
365 if(question.ask() == Question::YesResponse) { 410​ if(question.ask() == Question::YesResponse) {
366 ItemJob<DownloadItem> *job = m_provider.downloadLink(entry.uniqueId(), QString::number(pair.second)); 411​ ItemJob<DownloadItem> *job = m_provider.downloadLink(entry.uniqueId(), QString::number(pair.second));
367 connect(job, &BaseJob::finished, this, &AtticaProvider::downloadItemLoaded); 412​ connect(job, &BaseJob::finished, this, &AtticaProvider::downloadItemLoaded);
368 mDownloadLinkJobs[job] = qMakePair(entry, pair.second); 413​ mDownloadLinkJobs[job] = qMakePair(entry, pair.second);
369 job->start(); 414​ job->start();
370 } else { 415​ } else {
371 return; 416​ return;
372 } 417​ }
▲ Show 20 Lines • Show All 162 Lines • Show Last 20 Lines