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

Support for ATOM 0.3.

Browse source
This commit is contained in:
Martin Rotter 2017-10-04 08:47:04 +02:00
parent f677b6fc80
commit 8a7ca6b289
4 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/definitions/definitions.h
View file

@ -90,6 +90,7 @@
#define EXTERNAL_TOOL_PARAM_SEPARATOR "|||"
#define HTTP_HEADERS_ACCEPT "Accept"
#define HTTP_HEADERS_CONTENT_TYPE "Content-Type"
#define HTTP_HEADERS_AUTHORIZATION "Authorization"
#define MAX_ZOOM_FACTOR 5.0f

2
src/network-web/networkfactory.cpp
View file

@ -180,7 +180,7 @@ Downloader* NetworkFactory::performAsyncNetworkOperation(const QString& url, int
QString basic_value = username + ":" + password;
QString header_value = QString("Basic ") + QString(basic_value.toUtf8().toBase64());
downloader->appendRawHeader("Authorization", header_value.toLocal8Bit());
downloader->appendRawHeader(HTTP_HEADERS_AUTHORIZATION, header_value.toLocal8Bit());
}
downloader->manipulateData(url, operation, input_data, timeout, protected_contents, username, password);

16
src/services/owncloud/network/owncloudnetworkfactory.cpp
View file

@ -324,14 +324,14 @@ void OwnCloudNetworkFactory::markMessagesRead(RootItem::ReadStatus status, const
json["items"] = ids;
Downloader* downloader = NetworkFactory::performAsyncNetworkOperation(final_url,
qApp->settings()->value(GROUP(Feeds),
SETTING(Feeds::UpdateTimeout)).toInt(),
QJsonDocument(json).toJson(QJsonDocument::Compact),
CONTENT_TYPE,
QNetworkAccessManager::PutOperation,
true, m_authUsername, m_authPassword,
true);
NetworkFactory::performAsyncNetworkOperation(final_url,
qApp->settings()->value(GROUP(Feeds),
SETTING(Feeds::UpdateTimeout)).toInt(),
QJsonDocument(json).toJson(QJsonDocument::Compact),
CONTENT_TYPE,
QNetworkAccessManager::PutOperation,
true, m_authUsername, m_authPassword,
true);
}
void OwnCloudNetworkFactory::markMessagesStarred(RootItem::Importance importance,

15
src/services/standard/atomparser.cpp
View file

@ -24,7 +24,16 @@
#include "exceptions/applicationexception.h"
AtomParser::AtomParser(const QString& data) : FeedParser(data), m_atomNamespace(QSL("http://www.w3.org/2005/Atom")) {}
AtomParser::AtomParser(const QString& data) : FeedParser(data) {
QString version = m_xml.documentElement().attribute(QSL("version"));
if (version == QSL("0.3")) {
m_atomNamespace = QSL("http://purl.org/atom/ns#");
}
else {
m_atomNamespace = QSL("http://www.w3.org/2005/Atom");
}
}
AtomParser::~AtomParser() {}
@ -68,6 +77,10 @@ Message AtomParser::extractMessage(const QDomElement& msg_element, QDateTime cur
new_message.m_author = qApp->web()->escapeHtml(messageAuthor(msg_element));
QString updated = textsFromPath(msg_element, m_atomNamespace, QSL("updated"), true).join(QSL(", "));
if (updated.isEmpty()) {
updated = textsFromPath(msg_element, m_atomNamespace, QSL("modified"), true).join(QSL(", "));
}
// Deal with creation date.
new_message.m_created = TextFactory::parseDateTime(updated);
new_message.m_createdFromFeed = !new_message.m_created.isNull();