FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Work on proper message metadata filling.

Browse Source
This commit is contained in:
Martin Rotter 2017-10-21 20:24:14 +02:00
parent d8c2f7bfc5
commit 4bce95c9d0
3 changed files with 61 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/services/gmail/definitions.h
View File

@ -15,6 +15,13 @@
#define GMAIL_MAX_BATCH_SIZE 999
#define GMAIL_MIN_BATCH_SIZE 20
#define GMAIL_SYSTEM_LABEL_UNREAD "UNREAD"
#define GMAIL_SYSTEM_LABEL_INBOX "INBOX"
#define GMAIL_SYSTEM_LABEL_SENT "SENT"
#define GMAIL_SYSTEM_LABEL_DRAFT "DRAFT"
#define GMAIL_SYSTEM_LABEL_SPAM "SPAM"
#define GMAIL_SYSTEM_LABEL_STARRED "STARRED"
#define GMAIL_CONTENT_TYPE_HTTP "application/http"
#endif // GMAIL_DEFINITIONS_H

9
src/services/gmail/gmailserviceroot.cpp
View File

@ -7,6 +7,7 @@
#include "miscellaneous/iconfactory.h"
#include "network-web/oauth2service.h"
#include "services/abstract/recyclebin.h"
#include "services/gmail/definitions.h"
#include "services/gmail/gmailentrypoint.h"
#include "services/gmail/gmailfeed.h"
#include "services/gmail/network/gmailnetworkfactory.h"
@ -32,14 +33,14 @@ void GmailServiceRoot::updateTitle() {
RootItem* GmailServiceRoot::obtainNewTreeForSyncIn() const {
RootItem* root = new RootItem();
GmailFeed* inbox = new GmailFeed(tr("Inbox"), QSL("INBOX"), qApp->icons()->fromTheme(QSL("mail-inbox")), root);
GmailFeed* inbox = new GmailFeed(tr("Inbox"), QSL(GMAIL_SYSTEM_LABEL_INBOX), qApp->icons()->fromTheme(QSL("mail-inbox")), root);
inbox->setKeepOnTop(true);
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));
root->appendChild(new GmailFeed(tr("Sent"), QSL(GMAIL_SYSTEM_LABEL_SENT), qApp->icons()->fromTheme(QSL("mail-sent")), root));
root->appendChild(new GmailFeed(tr("Drafts"), QSL(GMAIL_SYSTEM_LABEL_DRAFT), qApp->icons()->fromTheme(QSL("gtk-edit")), root));
root->appendChild(new GmailFeed(tr("Spam"), QSL(GMAIL_SYSTEM_LABEL_SPAM), qApp->icons()->fromTheme(QSL("mail-mark-junk")), root));
return root;
}

56
src/services/gmail/network/gmailnetworkfactory.cpp
View File

@ -338,20 +338,62 @@ void GmailNetworkFactory::fillFullMessage(Message& msg, const QJsonObject& json,
headers.insert(header.toObject()["name"].toString(), header.toObject()["value"].toString());
}
msg.m_isRead = true;
// Assign correct main labels/states.
foreach (const QVariant& label, json["labelIds"].toArray().toVariantList()) {
QString lbl = label.toString();
if (lbl == QL1S(GMAIL_SYSTEM_LABEL_UNREAD)) {
msg.m_isRead = false;
}
else if (lbl == QL1S(GMAIL_SYSTEM_LABEL_STARRED)) {
msg.m_isImportant = true;
}
// RSS Guard does not support multi-labeling of messages, thus each message can have MAX single label.
// Every message which is in INBOX, must be in INBOX, even if Gmail API returns more labels for the message.
// I have to always decide which single label is most important one.
}
msg.m_author = headers["From"];
msg.m_title = headers["Subject"];
msg.m_createdFromFeed = true;
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();
QByteArray body_data = body_obj["body"].toObject()["data"].toString().toLocal8Bit();
if (msg.m_title.isEmpty()) {
msg.m_title = tr("No subject");
}
if (!body_data.isEmpty()) {
msg.m_contents = QByteArray::fromBase64(body_data, QByteArray::Base64Option::Base64UrlEncoding);
break;
QString backup_contents;
foreach (const QJsonValue& part, json["payload"].toObject()["parts"].toArray()) {
QJsonObject part_obj = part.toObject();
QJsonObject body = part_obj["body"].toObject();
QString filename = part_obj["filename"].toString();
if (filename.isEmpty() && body.contains(QL1S("data"))) {
// We have textual data of e-mail.
// We check if it is HTML.
if (msg.m_contents.isEmpty()) {
if (part_obj["mimeType"].toString().contains(QL1S("text/html"))) {
msg.m_contents = QByteArray::fromBase64(body["data"].toString().toUtf8(), QByteArray::Base64Option::Base64UrlEncoding);
}
else {
backup_contents = QByteArray::fromBase64(body["data"].toString().toUtf8(), QByteArray::Base64Option::Base64UrlEncoding);
}
}
}
else {
// We have attachment.
msg.m_enclosures.append(Enclosure(QL1S("##") + body["attachmentId"].toString(),
filename + QString(" (%1 KB)").arg(QString::number(body["size"].toInt() / 1000.0))));
}
}
if (msg.m_contents.isEmpty() && !backup_contents.isEmpty()) {
msg.m_contents = backup_contents;
}
}