From 695baf9cbb4361c8a5e7ca0065f31cc853f5226e Mon Sep 17 00:00:00 2001 From: Bart De Vries Date: Tue, 20 Apr 2021 20:53:24 +0200 Subject: [PATCH] Add fetch function that can take a list of urls --- src/fetcher.cpp | 27 +++++++++++++++++---------- src/fetcher.h | 1 + 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/fetcher.cpp b/src/fetcher.cpp index 306c4f73..093160e1 100644 --- a/src/fetcher.cpp +++ b/src/fetcher.cpp @@ -62,30 +62,37 @@ void Fetcher::fetch(const QString &url) }); } -void Fetcher::fetchAll() +void Fetcher::fetch(const QStringList &urls) { if (m_updating) return; // update is already running, do nothing - QSqlQuery query; - query.prepare(QStringLiteral("SELECT COUNT (url) FROM Feeds;")); - Database::instance().execute(query); - query.next(); - if (query.value(0).toInt() == 0) - return; // no feeds in database - m_updating = true; m_updateProgress = 0; - m_updateTotal = query.value(0).toInt(); + m_updateTotal = urls.count(); connect(this, &Fetcher::updateProgressChanged, this, &Fetcher::updateMonitor); Q_EMIT updatingChanged(m_updating); Q_EMIT updateProgressChanged(m_updateProgress); Q_EMIT updateTotalChanged(m_updateTotal); + for (int i=0; i 0) + fetch(urls); + else + return; // no feeds in database } void Fetcher::updateMonitor(int progress) diff --git a/src/fetcher.h b/src/fetcher.h index 48171185..402bc11f 100644 --- a/src/fetcher.h +++ b/src/fetcher.h @@ -27,6 +27,7 @@ public: return _instance; } Q_INVOKABLE void fetch(const QString &url); + Q_INVOKABLE void fetch(const QStringList &urls); Q_INVOKABLE void fetchAll(); Q_INVOKABLE QString image(const QString &url) const; void removeImage(const QString &url);