Castopod/kasts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor import feeds to be able to show progress

Browse Source
This commit is contained in:
Bart De Vries 2021-04-20 21:14:19 +02:00
parent 695baf9cbb
commit 295b98a903
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/datamanager.cpp
View File

@ -292,7 +292,7 @@ void DataManager::removeFeed(const int &index)
Q_EMIT feedRemoved(index); Q_EMIT feedRemoved(index);
} }
void DataManager::addFeed(const QString &url) void DataManager::addFeed(const QString &url, bool fetch = true)
{ {
// This method will add the relevant internal data structures, and then add // This method will add the relevant internal data structures, and then add
// a preliminary entry into the database. Those details (as well as entries, // a preliminary entry into the database. Those details (as well as entries,
@ -326,7 +326,17 @@ void DataManager::addFeed(const QString &url)
Q_EMIT feedAdded(urlFromInput.toString()); Q_EMIT feedAdded(urlFromInput.toString());
Fetcher::instance().fetch(urlFromInput.toString()); if (fetch) Fetcher::instance().fetch(urlFromInput.toString());
}
void DataManager::addFeeds(const QStringList &urls)
{
if (urls.count() == 0) return;
for (int i=0; i<urls.count(); i++) {
addFeed(urls[i], false); // add preliminary feed entries, but do not fetch yet
}
Fetcher::instance().fetch(urls);
} }
Entry* DataManager::getQueueEntry(int const &index) const Entry* DataManager::getQueueEntry(int const &index) const
@ -465,13 +475,16 @@ void DataManager::importFeeds(const QString &path)
file.open(QIODevice::ReadOnly); file.open(QIODevice::ReadOnly);
QStringList urls;
QXmlStreamReader xmlReader(&file); QXmlStreamReader xmlReader(&file);
while(!xmlReader.atEnd()) { while(!xmlReader.atEnd()) {
xmlReader.readNext(); xmlReader.readNext();
if(xmlReader.tokenType() == 4 && xmlReader.attributes().hasAttribute(QStringLiteral("xmlUrl"))) { if(xmlReader.tokenType() == 4 && xmlReader.attributes().hasAttribute(QStringLiteral("xmlUrl"))) {
addFeed(xmlReader.attributes().value(QStringLiteral("xmlUrl")).toString()); urls += xmlReader.attributes().value(QStringLiteral("xmlUrl")).toString();
} }
} }
qDebug() << urls;
addFeeds(urls);
} }
void DataManager::exportFeeds(const QString &path) void DataManager::exportFeeds(const QString &path)

3
src/datamanager.h
View File

@ -33,7 +33,8 @@ public:
int entryCount(const EpisodeModel::Type type) const; int entryCount(const EpisodeModel::Type type) const;
int unreadEntryCount(const Feed* feed) const; int unreadEntryCount(const Feed* feed) const;
int newEntryCount(const Feed* feed) const; int newEntryCount(const Feed* feed) const;
Q_INVOKABLE void addFeed(const QString &url); Q_INVOKABLE void addFeed(const QString &url, bool fetch);
Q_INVOKABLE void addFeeds(const QStringList &urls);
Q_INVOKABLE void removeFeed(const Feed* feed); Q_INVOKABLE void removeFeed(const Feed* feed);
Q_INVOKABLE void removeFeed(const int &index); Q_INVOKABLE void removeFeed(const int &index);