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

greader new algo working with reedah too

Browse Source
This commit is contained in:
Martin Rotter 2021-08-04 13:24:37 +02:00
parent c1dc8830d5
commit 7c7c991fab
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/librssguard/services/greader/greadernetwork.cpp
View File

@ -213,8 +213,17 @@ void GreaderNetwork::prepareFeedFetching(GreaderServiceRoot* root,
}
Feed::Status error;
QList<QString> to_download_list(to_download.begin(), to_download.end());
m_prefetchedMessages = itemContents(root, QList<QString>(to_download.begin(), to_download.end()), error, proxy);
if (!to_download_list.isEmpty()) {
if (m_service == GreaderServiceRoot::Service::Reedah) {
for (int i = 0; i < to_download_list.size(); i++) {
to_download_list.replace(i, convertLongStreamIdToShortStreamId(to_download_list.at(i)));
}
}
m_prefetchedMessages = itemContents(root, to_download_list, error, proxy);
}
}
QList<Message> GreaderNetwork::getMessagesIntelligently(ServiceRoot* root,
@ -283,6 +292,12 @@ QList<Message> GreaderNetwork::getMessagesIntelligently(ServiceRoot* root,
QList<QString> to_download_list(to_download.begin(), to_download.end());
if (!to_download_list.isEmpty()) {
if (m_service == GreaderServiceRoot::Service::Reedah) {
for (int i = 0; i < to_download_list.size(); i++) {
to_download_list.replace(i, convertLongStreamIdToShortStreamId(to_download_list.at(i)));
}
}
msgs = itemContents(root, to_download_list, error, proxy);
}
}
@ -849,7 +864,16 @@ bool GreaderNetwork::ensureLogin(const QNetworkProxy& proxy, QNetworkReply::Netw
return true;
}
QString GreaderNetwork::convertLongStreamIdToShortStreamId(const QString& stream_id) const {
return QString::number(QString(stream_id).replace(QSL("tag:google.com,2005:reader/item/"),
QString()).toULongLong(nullptr, 16));
}
QString GreaderNetwork::convertShortStreamIdToLongStreamId(const QString& stream_id) const {
if (stream_id.startsWith(QSL("tag:google.com,2005:reader/item/"))) {
return stream_id;
}
if (m_service == GreaderServiceRoot::Service::TheOldReader) {
return QSL("tag:google.com,2005:reader/item/%1").arg(stream_id);
}

2
src/librssguard/services/greader/greadernetwork.h
View File

@ -98,7 +98,9 @@ class GreaderNetwork : public QObject {
// Make sure we are logged in and if we are not, return error.
bool ensureLogin(const QNetworkProxy& proxy, QNetworkReply::NetworkError* output = nullptr);
QString convertLongStreamIdToShortStreamId(const QString& stream_id) const;
QString convertShortStreamIdToLongStreamId(const QString& stream_id) const;
QString simplifyStreamId(const QString& stream_id) const;
QStringList decodeItemIds(const QString& stream_json_data, QString& continuation);
QList<Message> decodeStreamContents(ServiceRoot* root, const QString& stream_json_data, const QString& stream_id, QString& continuation);