From edec9d758277d192a3f934c7a6965b42b647317b Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Fri, 20 Oct 2017 23:12:08 +0200 Subject: [PATCH] Can load messages for gmail acc and display them. --- src/miscellaneous/databasequeries.cpp | 32 +++++++++++++++++++ src/miscellaneous/databasequeries.h | 1 + src/services/gmail/gmailserviceroot.cpp | 29 +++++++++++++---- src/services/gmail/gmailserviceroot.h | 4 +++ .../gmail/network/gmailnetworkfactory.cpp | 16 ++++++++-- .../gmail/network/gmailnetworkfactory.h | 2 +- 6 files changed, 74 insertions(+), 10 deletions(-) diff --git a/src/miscellaneous/databasequeries.cpp b/src/miscellaneous/databasequeries.cpp index c169ab4ea..78af8cf24 100755 --- a/src/miscellaneous/databasequeries.cpp +++ b/src/miscellaneous/databasequeries.cpp @@ -8,6 +8,7 @@ #include "network-web/oauth2service.h" #include "services/abstract/category.h" #include "services/gmail/definitions.h" +#include "services/gmail/gmailfeed.h" #include "services/gmail/gmailserviceroot.h" #include "services/gmail/network/gmailnetworkfactory.h" #include "services/inoreader/definitions.h" @@ -1475,6 +1476,37 @@ Assignment DatabaseQueries::getCategories(QSqlDatabase db, int account_id, bool* return categories; } +Assignment DatabaseQueries::getGmailFeeds(QSqlDatabase db, int account_id, bool* ok) { + Assignment feeds; + QSqlQuery q(db); + + q.setForwardOnly(true); + q.prepare(QSL("SELECT * FROM Feeds WHERE account_id = :account_id;")); + q.bindValue(QSL(":account_id"), account_id); + + if (!q.exec()) { + qFatal("Gmail: Query for obtaining feeds failed. Error message: '%s'.", qPrintable(q.lastError().text())); + + if (ok != nullptr) { + *ok = false; + } + } + + while (q.next()) { + AssignmentItem pair; + + pair.first = q.value(FDS_DB_CATEGORY_INDEX).toInt(); + pair.second = new GmailFeed(q.record()); + feeds << pair; + } + + if (ok != nullptr) { + *ok = true; + } + + return feeds; +} + QList DatabaseQueries::getGmailAccounts(QSqlDatabase db, bool* ok) { QSqlQuery query(db); diff --git a/src/miscellaneous/databasequeries.h b/src/miscellaneous/databasequeries.h index 7ce40f858..d2495f83c 100755 --- a/src/miscellaneous/databasequeries.h +++ b/src/miscellaneous/databasequeries.h @@ -63,6 +63,7 @@ class DatabaseQueries { static Assignment getCategories(QSqlDatabase db, int account_id, bool* ok = nullptr); // Gmail account. + static Assignment getGmailFeeds(QSqlDatabase db, int account_id, bool* ok = nullptr); static bool deleteGmailAccount(QSqlDatabase db, int account_id); static QList getGmailAccounts(QSqlDatabase db, bool* ok = nullptr); static bool overwriteGmailAccount(QSqlDatabase db, const QString& username, const QString& app_id, diff --git a/src/services/gmail/gmailserviceroot.cpp b/src/services/gmail/gmailserviceroot.cpp index fe29c00ea..2cc1fafc9 100755 --- a/src/services/gmail/gmailserviceroot.cpp +++ b/src/services/gmail/gmailserviceroot.cpp @@ -47,15 +47,28 @@ void GmailServiceRoot::updateTitle() { setTitle(m_network->userName() + QSL(" (Gmail)")); } -void GmailServiceRoot::loadFromDatabase() { - GmailFeed* inbox = new GmailFeed(tr("Inbox"), QSL("INBOX"), qApp->icons()->fromTheme(QSL("mail-inbox")), this); +RootItem* GmailServiceRoot::obtainNewTreeForSyncIn() const { + RootItem* root = new RootItem(); + GmailFeed* inbox = new GmailFeed(tr("Inbox"), QSL("INBOX"), qApp->icons()->fromTheme(QSL("mail-inbox")), root); inbox->setKeepOnTop(true); - appendChild(inbox); - appendChild(new GmailFeed(tr("Sent"), QSL("SENT"), qApp->icons()->fromTheme(QSL("mail-sent")), this)); - appendChild(new GmailFeed(tr("Drafts"), QSL("DRAFT"), qApp->icons()->fromTheme(QSL("gtk-edit")), this)); - appendChild(new GmailFeed(tr("Spam"), QSL("SPAM"), qApp->icons()->fromTheme(QSL("mail-mark-junk")), this)); + root->appendChild(inbox); + root->appendChild(new GmailFeed(tr("Sent"), QSL("SENT"), qApp->icons()->fromTheme(QSL("mail-sent")), root)); + root->appendChild(new GmailFeed(tr("Drafts"), QSL("DRAFT"), qApp->icons()->fromTheme(QSL("gtk-edit")), root)); + root->appendChild(new GmailFeed(tr("Spam"), QSL("SPAM"), qApp->icons()->fromTheme(QSL("mail-mark-junk")), root)); + + return root; +} + +void GmailServiceRoot::loadFromDatabase() { + QSqlDatabase database = qApp->database()->connection(metaObject()->className(), DatabaseFactory::FromSettings); + Assignment categories = DatabaseQueries::getCategories(database, accountId()); + Assignment feeds = DatabaseQueries::getGmailFeeds(database, accountId()); + + // All data are now obtained, lets create the hierarchy. + assembleCategories(categories); + assembleFeeds(feeds); // As the last item, add recycle bin, which is needed. appendChild(recycleBin()); @@ -123,6 +136,10 @@ void GmailServiceRoot::start(bool freshly_activated) { loadCacheFromFile(accountId()); m_network->oauth()->login(); + + if (childCount() <= 1) { + syncIn(); + } } void GmailServiceRoot::stop() { diff --git a/src/services/gmail/gmailserviceroot.h b/src/services/gmail/gmailserviceroot.h index 79ebb3bdb..1eb36e011 100755 --- a/src/services/gmail/gmailserviceroot.h +++ b/src/services/gmail/gmailserviceroot.h @@ -54,12 +54,16 @@ class GmailServiceRoot : public ServiceRoot, public CacheForServiceRoot { public slots: void updateTitle(); + protected: + RootItem* obtainNewTreeForSyncIn() const; + private: void loadFromDatabase(); private: QList m_serviceMenu; GmailNetworkFactory* m_network; + }; inline void GmailServiceRoot::setNetwork(GmailNetworkFactory* network) { diff --git a/src/services/gmail/network/gmailnetworkfactory.cpp b/src/services/gmail/network/gmailnetworkfactory.cpp index a0c9c867e..1e469bd63 100755 --- a/src/services/gmail/network/gmailnetworkfactory.cpp +++ b/src/services/gmail/network/gmailnetworkfactory.cpp @@ -139,12 +139,13 @@ QList GmailNetworkFactory::messages(const QString& stream_id, Feed::Sta QString messages_data = downloader.lastOutputData(); QList more_messages = decodeLiteMessages(messages_data, stream_id, next_page_token); + QList full_messages; // Now, we via batch HTTP request obtain full data for each message. - bool obtained = obtainAndDecodeFullMessages(more_messages, stream_id); + bool obtained = obtainAndDecodeFullMessages(more_messages, stream_id, full_messages); if (obtained) { - messages.append(more_messages); + messages.append(full_messages); // New batch of messages was obtained, check if we have enough. if (batchSize() > 0 && batchSize() <= messages.size()) { @@ -343,9 +344,17 @@ void GmailNetworkFactory::fillFullMessage(Message& msg, const QJsonObject& json, msg.m_created = TextFactory::parseDateTime(headers["Date"]); // TODO: Pokračovat. + foreach (const QJsonValue& body_part, json["payload"].toObject()["parts"].toArray()) { + QJsonObject body_obj = body_part.toObject(); + + msg.m_contents = QByteArray::fromBase64(body_obj["body"].toObject()["data"].toString().toLocal8Bit(), + QByteArray::Base64Option::Base64UrlEncoding); + } } -bool GmailNetworkFactory::obtainAndDecodeFullMessages(QList& lite_messages, const QString& feed_id) { +bool GmailNetworkFactory::obtainAndDecodeFullMessages(const QList& lite_messages, + const QString& feed_id, + QList& full_messages) { QHttpMultiPart* multi = new QHttpMultiPart(); multi->setContentType(QHttpMultiPart::ContentType::MixedType); @@ -393,6 +402,7 @@ bool GmailNetworkFactory::obtainAndDecodeFullMessages(QList& lite_messa Message& msg = msgs[msg_id]; fillFullMessage(msg, msg_doc, feed_id); + full_messages.append(msg); } } diff --git a/src/services/gmail/network/gmailnetworkfactory.h b/src/services/gmail/network/gmailnetworkfactory.h index 8ef54c9ce..75faec7d9 100755 --- a/src/services/gmail/network/gmailnetworkfactory.h +++ b/src/services/gmail/network/gmailnetworkfactory.h @@ -48,7 +48,7 @@ class GmailNetworkFactory : public QObject { private: void fillFullMessage(Message& msg, const QJsonObject& json, const QString& feed_id); - bool obtainAndDecodeFullMessages(QList& lite_messages, const QString& feed_id); + bool obtainAndDecodeFullMessages(const QList& lite_messages, const QString& feed_id, QList& full_messages); QList decodeLiteMessages(const QString& messages_json_data, const QString& stream_id, QString& next_page_token); //RootItem* decodeFeedCategoriesData(const QString& categories);