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

tags sync works

Browse Source
This commit is contained in:
Martin Rotter 2021-02-18 14:08:40 +01:00
parent a902984fb2
commit 391c969ebf
4 changed files with 137 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/librssguard/services/feedly/definitions.h
View File

@ -4,7 +4,8 @@
#define FEEDLY_UNLIMITED_BATCH_SIZE -1
#define FEEDLY_DEFAULT_BATCH_SIZE 20
#define FEEDLY_MAX_BATCH_SIZE 500
#define FEEDLX_MAX_TOTAL_SIZE 5000
#define FEEDLY_MAX_TOTAL_SIZE 5000
#define FEEDLY_UNTAG_BATCH_SIZE 100
#define FEEDLY_GENERATE_DAT "https://feedly.com/v3/auth/dev"

86
src/librssguard/services/feedly/feedlynetwork.cpp
View File

@ -45,6 +45,89 @@ FeedlyNetwork::FeedlyNetwork(QObject* parent)
#endif
}
void FeedlyNetwork::untagEntries(const QString& tag_id, const QStringList& msg_custom_ids) {
if (msg_custom_ids.isEmpty()) {
return;
}
QString bear = bearer();
if (bear.isEmpty()) {
qCriticalNN << LOGSEC_FEEDLY << "Cannot untag entries, because bearer is empty.";
throw NetworkException(QNetworkReply::NetworkError::AuthenticationRequiredError);
}
QString target_url = fullUrl(Service::TagEntries) +
QSL("/%1/").arg(QString(QUrl::toPercentEncoding(tag_id)));
int timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt();
QByteArray output;
int i = 0;
do {
auto msg_batch = msg_custom_ids.mid(i, FEEDLY_UNTAG_BATCH_SIZE);
i += FEEDLY_UNTAG_BATCH_SIZE;
auto ids = boolinq::from(msg_batch).select([](const QString& msg_id) {
return QString(QUrl::toPercentEncoding(msg_id));
}).toStdList();
QString final_url = target_url + FROM_STD_LIST(QStringList, ids).join(',');
auto result = NetworkFactory::performNetworkOperation(final_url,
timeout,
{},
output,
QNetworkAccessManager::Operation::DeleteOperation,
{ bearerHeader(bear) },
false,
{},
{},
m_service->networkProxy());
if (result.first != QNetworkReply::NetworkError::NoError) {
throw NetworkException(result.first, output);
}
}
while (i < msg_custom_ids.size());
}
void FeedlyNetwork::tagEntries(const QString& tag_id, const QStringList& msg_custom_ids) {
if (msg_custom_ids.isEmpty()) {
return;
}
QString bear = bearer();
if (bear.isEmpty()) {
qCriticalNN << LOGSEC_FEEDLY << "Cannot tag entries, because bearer is empty.";
throw NetworkException(QNetworkReply::NetworkError::AuthenticationRequiredError);
}
QString target_url = fullUrl(Service::TagEntries) + QSL("/%1").arg(QString(QUrl::toPercentEncoding(tag_id)));
int timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt();
QByteArray output;
QByteArray input_data;
QJsonObject input;
input["entryIds"] = QJsonArray::fromStringList(msg_custom_ids);
input_data = QJsonDocument(input).toJson(QJsonDocument::JsonFormat::Compact);
auto result = NetworkFactory::performNetworkOperation(target_url,
timeout,
input_data,
output,
QNetworkAccessManager::Operation::PutOperation,
{ bearerHeader(bear),
{ "Content-Type", "application/json" } },
false,
{},
{},
m_service->networkProxy());
if (result.first != QNetworkReply::NetworkError::NoError) {
throw NetworkException(result.first, output);
}
}
void FeedlyNetwork::markers(const QString& action, const QStringList& msg_custom_ids) {
if (msg_custom_ids.isEmpty()) {
return;
@ -137,7 +220,7 @@ QList<Message> FeedlyNetwork::streamContents(const QString& stream_id) {
}
while (!continuation.isEmpty() &&
(m_batchSize <= 0 || messages.size() < m_batchSize) &&
messages.size() <= FEEDLX_MAX_TOTAL_SIZE);
messages.size() <= FEEDLY_MAX_TOTAL_SIZE);
return messages;
}
@ -466,6 +549,7 @@ QString FeedlyNetwork::fullUrl(FeedlyNetwork::Service service) const {
return QSL(FEEDLY_API_URL_BASE) + FEEDLY_API_URL_COLLETIONS;
case Service::Tags:
case Service::TagEntries:
return QSL(FEEDLY_API_URL_BASE) + FEEDLY_API_URL_TAGS;
case Service::StreamContents:

5
src/librssguard/services/feedly/feedlynetwork.h
View File

@ -21,6 +21,8 @@ class FeedlyNetwork : public QObject {
explicit FeedlyNetwork(QObject* parent = nullptr);
// API operations.
void untagEntries(const QString& tag_id, const QStringList& msg_custom_ids);
void tagEntries(const QString& tag_id, const QStringList& msg_custom_ids);
void markers(const QString& action, const QStringList& msg_custom_ids);
QList<Message> streamContents(const QString& stream_id);
QVariantHash profile(const QNetworkProxy& network_proxy);
@ -58,7 +60,8 @@ class FeedlyNetwork : public QObject {
Collections,
Tags,
StreamContents,
Markers
Markers,
TagEntries
};
QString fullUrl(Service service) const;

72
src/librssguard/services/feedly/feedlyserviceroot.cpp
View File

@ -137,37 +137,57 @@ void FeedlyServiceRoot::saveAllCachedData(bool ignore_errors) {
}
}
/*
QMapIterator<QString, QStringList> k(msg_cache.m_cachedLabelAssignments);
QMapIterator<QString, QStringList> k(msg_cache.m_cachedLabelAssignments);
// Assign label for these messages.
while (k.hasNext()) {
k.next();
auto label_custom_id = k.key();
QStringList messages = k.value();
// Assign label for these messages.
while (k.hasNext()) {
k.next();
auto label_custom_id = k.key();
QStringList messages = k.value();
if (!messages.isEmpty()) {
if (network()->editLabels(label_custom_id, true, messages) != QNetworkReply::NetworkError::NoError && !ignore_errors) {
addLabelsAssignmentsToCache(messages, label_custom_id, true);
if (!messages.isEmpty()) {
try {
network()->tagEntries(label_custom_id, messages);
}
}
}
catch (const NetworkException& net_ex) {
qCriticalNN << LOGSEC_FEEDLY
<< "Failed to synchronize tag assignments with error:"
<< QUOTE_W_SPACE(net_ex.message())
<< "and HTTP code"
<< QUOTE_W_SPACE_DOT(net_ex.networkError());
QMapIterator<QString, QStringList> l(msg_cache.m_cachedLabelDeassignments);
// Remove label from these messages.
while (l.hasNext()) {
l.next();
auto label_custom_id = l.key();
QStringList messages = l.value();
if (!messages.isEmpty()) {
if (network()->editLabels(label_custom_id, false, messages) != QNetworkReply::NetworkError::NoError && !ignore_errors) {
addLabelsAssignmentsToCache(messages, label_custom_id, false);
if (!ignore_errors) {
addLabelsAssignmentsToCache(messages, label_custom_id, true);
}
}
}
}
*/
}
}
QMapIterator<QString, QStringList> l(msg_cache.m_cachedLabelDeassignments);
// Remove label from these messages.
while (l.hasNext()) {
l.next();
auto label_custom_id = l.key();
QStringList messages = l.value();
if (!messages.isEmpty()) {
try {
network()->untagEntries(label_custom_id, messages);
}
catch (const NetworkException& net_ex) {
qCriticalNN << LOGSEC_FEEDLY
<< "Failed to synchronize tag DEassignments with error:"
<< QUOTE_W_SPACE(net_ex.message())
<< "and HTTP code"
<< QUOTE_W_SPACE_DOT(net_ex.networkError());
if (!ignore_errors) {
addLabelsAssignmentsToCache(messages, label_custom_id, false);
}
}
}
}
}
void FeedlyServiceRoot::updateTitle() {