FreshRSS/rssguard
1
0
Fork 0
mirror of https://github.com/martinrotter/rssguard.git synced 2024-12-27 08:33:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Load item/contents in batches.

Browse Source
This commit is contained in:
Martin Rotter 2021-07-31 19:33:08 +02:00
parent e02260297d
commit 3bcad1cf84
2 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/librssguard/services/greader/definitions.h
View File

@ -33,6 +33,7 @@
// Misc.
#define GREADER_API_EDIT_TAG_BATCH 200
#define GREADER_API_ITEM_CONTENTS_BATCH 999
#define GREADER_GLOBAL_UPDATE_THRES 0.5
// The Old Reader.

73
src/librssguard/services/greader/greadernetwork.cpp
View File

@ -339,47 +339,54 @@ QList<Message> GreaderNetwork::itemContents(ServiceRoot* root, const QList<QStri
}
QList<Message> msgs;
QList<QString> my_stream_ids(stream_ids);
do {
QString full_url = generateFullUrl(Operations::ItemContents);
auto timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt();
while (!my_stream_ids.isEmpty()) {
QList<QString> batch_ids = my_stream_ids.mid(0, GREADER_API_ITEM_CONTENTS_BATCH);
if (!continuation.isEmpty()) {
full_url += QSL("&c=%1").arg(continuation);
}
my_stream_ids = my_stream_ids.mid(GREADER_API_ITEM_CONTENTS_BATCH);
std::list inp = boolinq::from(stream_ids).select([this](const QString& id) {
return QSL("i=%1").arg(m_service == GreaderServiceRoot::Service::TheOldReader
do {
QString full_url = generateFullUrl(Operations::ItemContents);
auto timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt();
if (!continuation.isEmpty()) {
full_url += QSL("&c=%1").arg(continuation);
}
std::list inp = boolinq::from(batch_ids).select([this](const QString& id) {
return QSL("i=%1").arg(m_service == GreaderServiceRoot::Service::TheOldReader
? id
: QUrl::toPercentEncoding(id));
}).toStdList();
QByteArray input = FROM_STD_LIST(QStringList, inp).join(QSL("&")).toUtf8();
QByteArray output_stream;
auto result_stream = NetworkFactory::performNetworkOperation(full_url,
timeout,
input,
output_stream,
QNetworkAccessManager::Operation::PostOperation,
{ authHeader() },
false,
{},
{},
proxy);
}).toStdList();
QByteArray input = FROM_STD_LIST(QStringList, inp).join(QSL("&")).toUtf8();
QByteArray output_stream;
auto result_stream = NetworkFactory::performNetworkOperation(full_url,
timeout,
input,
output_stream,
QNetworkAccessManager::Operation::PostOperation,
{ authHeader() },
false,
{},
{},
proxy);
if (result_stream.first != QNetworkReply::NetworkError::NoError) {
qCriticalNN << LOGSEC_GREADER
<< "Cannot download messages for "
<< stream_ids
<< ", network error:"
<< QUOTE_W_SPACE_DOT(result_stream.first);
error = Feed::Status::NetworkError;
return {};
}
else {
msgs.append(decodeStreamContents(root, output_stream, QString(), continuation));
if (result_stream.first != QNetworkReply::NetworkError::NoError) {
qCriticalNN << LOGSEC_GREADER
<< "Cannot download messages for "
<< batch_ids
<< ", network error:"
<< QUOTE_W_SPACE_DOT(result_stream.first);
error = Feed::Status::NetworkError;
return {};
}
else {
msgs.append(decodeStreamContents(root, output_stream, QString(), continuation));
}
}
while (!continuation.isEmpty());
}
while (!continuation.isEmpty());
error = Feed::Status::Normal;
return msgs;