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

Work on getting inoreader cats.

Browse Source
This commit is contained in:
Martin Rotter 2017-09-24 22:45:52 +02:00
parent bba41c5e60
commit 2360b4ba9d
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/services/inoreader/network/inoreadernetworkfactory.cpp
View File

@ -22,6 +22,7 @@
#include "gui/dialogs/formmain.h" #include "gui/dialogs/formmain.h"
#include "gui/tabwidget.h" #include "gui/tabwidget.h"
#include "miscellaneous/application.h" #include "miscellaneous/application.h"
#include "network-web/networkfactory.h"
#include "network-web/silentnetworkaccessmanager.h" #include "network-web/silentnetworkaccessmanager.h"
#include "network-web/webfactory.h" #include "network-web/webfactory.h"
#include "services/abstract/category.h" #include "services/abstract/category.h"
@ -85,7 +86,7 @@ void InoreaderNetworkFactory::tokensReceived(QVariantMap tokens) {
} }
void InoreaderNetworkFactory::initializeOauth() { void InoreaderNetworkFactory::initializeOauth() {
auto oauth_reply_handler = new QOAuthHttpServerReplyHandler(INOREADER_OAUTH_PORT, this); QOAuthHttpServerReplyHandler* oauth_reply_handler = new QOAuthHttpServerReplyHandler(INOREADER_OAUTH_PORT, this);
// Full redirect URL is thus "http://localhost:INOREADER_OAUTH_PORT/". // Full redirect URL is thus "http://localhost:INOREADER_OAUTH_PORT/".
oauth_reply_handler->setCallbackPath(QSL("")); oauth_reply_handler->setCallbackPath(QSL(""));
@ -151,7 +152,6 @@ RootItem* InoreaderNetworkFactory::feedsCategories(bool obtain_icons) {
QNetworkReply* reply = m_oauth2->get(QUrl(INOREADER_API_LIST_LABELS)); QNetworkReply* reply = m_oauth2->get(QUrl(INOREADER_API_LIST_LABELS));
QEventLoop loop; QEventLoop loop;
RootItem* result = nullptr;
connect(reply, &QNetworkReply::finished, [&]() { connect(reply, &QNetworkReply::finished, [&]() {
if (reply->error() == QNetworkReply::NoError) { if (reply->error() == QNetworkReply::NoError) {
@ -172,11 +172,21 @@ RootItem* InoreaderNetworkFactory::feedsCategories(bool obtain_icons) {
cats.insert(category->customId(), category); cats.insert(category->customId(), category);
if (obtain_icons) { if (obtain_icons) {
QString category_url = label["iconUrl"].toString(); QString icon_url = label["iconUrl"].toString();
if (!category_url.isEmpty()) { if (!icon_url.isEmpty()) {
// Download the icon. QByteArray icon_data;
if (NetworkFactory::performNetworkOperation(icon_url, DOWNLOAD_TIMEOUT,
QByteArray(), QString(), icon_data,
QNetworkAccessManager::GetOperation).first ==
QNetworkReply::NoError) {
// Icon downloaded, set it up.
QPixmap icon_pixmap;
icon_pixmap.loadFromData(icon_data);
category->setIcon(QIcon(icon_pixmap));
}
} }
} }
@ -191,7 +201,7 @@ RootItem* InoreaderNetworkFactory::feedsCategories(bool obtain_icons) {
loop.exec(); loop.exec();
return result; return parent;
/* /*
// Process categories first, then process feeds. // Process categories first, then process feeds.