pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Work on batch http requests when getting msgs.

Browse source
This commit is contained in:
Martin Rotter 2017-10-19 13:16:13 +02:00
parent bdc53ff15d
commit b25fd514d0
2 changed files with 18 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/services/gmail/network/gmailnetworkfactory.cpp
View file

@ -136,13 +136,22 @@ QList<Message> GmailNetworkFactory::messages(const QString& stream_id, Feed::Sta
// We parse this chunk. // We parse this chunk.
QString messages_data = downloader.lastOutputData(); QString messages_data = downloader.lastOutputData();
QList<Message> more_messages = decodeLiteMessages(messages_data, stream_id); QList<Message> more_messages = decodeLiteMessages(messages_data, stream_id, next_page_token);
// Now, we via batch HTTP request obtain full data for each message. // Now, we via batch HTTP request obtain full data for each message.
bool obtained = obtainAndDecodeFullMessages(more_messages); bool obtained = obtainAndDecodeFullMessages(more_messages);
if (obtained) { if (obtained) {
messages.append(more_messages); messages.append(more_messages);
// New batch of messages was obtained, check if we have enough.
if (batchSize() > 0 && batchSize() <= messages.size()) {
// We have enough messages.
break;
}
}
else {
error = Feed::Status::NetworkError; error = Feed::Status::NetworkError;
return messages; return messages;
} }
@ -323,63 +332,20 @@ bool GmailNetworkFactory::obtainAndDecodeFullMessages(const QList<Message>& lite
return false; return false;
} }
QList<Message> GmailNetworkFactory::decodeLiteMessages(const QString& messages_json_data, const QString& stream_id) { QList<Message> GmailNetworkFactory::decodeLiteMessages(const QString& messages_json_data, const QString& stream_id,
QString& next_page_token) {
QList<Message> messages; QList<Message> messages;
QJsonArray json = QJsonDocument::fromJson(messages_json_data.toUtf8()).object()["items"].toArray(); QJsonObject top_object = QJsonDocument::fromJson(messages_json_data.toUtf8()).object();
QJsonArray json_msgs = top_object["messages"].toArray();
messages.reserve(json.count()); next_page_token = top_object["nextPageToken"].toString();
messages.reserve(json_msgs.count());
foreach (const QJsonValue& obj, json) { foreach (const QJsonValue& obj, json_msgs) {
auto message_obj = obj.toObject(); auto message_obj = obj.toObject();
Message message; Message message;
message.m_title = message_obj["title"].toString();
message.m_author = message_obj["author"].toString();
message.m_created = QDateTime::fromSecsSinceEpoch(message_obj["published"].toInt());
message.m_createdFromFeed = true;
message.m_customId = message_obj["id"].toString(); message.m_customId = message_obj["id"].toString();
auto alternates = message_obj["alternate"].toArray();
auto enclosures = message_obj["enclosure"].toArray();
auto categories = message_obj["categories"].toArray();
foreach (const QJsonValue& alt, alternates) {
auto alt_obj = alt.toObject();
QString mime = alt_obj["type"].toString();
QString href = alt_obj["href"].toString();
if (mime == QL1S("text/html")) {
message.m_url = href;
}
else {
message.m_enclosures.append(Enclosure(href, mime));
}
}
foreach (const QJsonValue& enc, enclosures) {
auto enc_obj = enc.toObject();
QString mime = enc_obj["type"].toString();
QString href = enc_obj["href"].toString();
message.m_enclosures.append(Enclosure(href, mime));
}
foreach (const QJsonValue& cat, categories) {
QString category = cat.toString();
// TODO: dodělat
//
/*
if (category.contains(INOREADER_STATE_READ)) {
message.m_isRead = !category.contains(INOREADER_STATE_READING_LIST);
}
else if (category.contains(INOREADER_STATE_IMPORTANT)) {
message.m_isImportant = category.contains(INOREADER_STATE_IMPORTANT);
}*/
}
message.m_contents = message_obj["summary"].toObject()["content"].toString();
message.m_feedId = stream_id; message.m_feedId = stream_id;
messages.append(message); messages.append(message);

2
src/services/gmail/network/gmailnetworkfactory.h
View file

@ -48,7 +48,7 @@ class GmailNetworkFactory : public QObject {
private: private:
bool obtainAndDecodeFullMessages(const QList<Message>& lite_messages); bool obtainAndDecodeFullMessages(const QList<Message>& lite_messages);
QList<Message> decodeLiteMessages(const QString& messages_json_data, const QString& stream_id); QList<Message> decodeLiteMessages(const QString& messages_json_data, const QString& stream_id, QString& next_page_token);
//RootItem* decodeFeedCategoriesData(const QString& categories); //RootItem* decodeFeedCategoriesData(const QString& categories);