work on feedly

resources/desktop/com.github.rssguard.appdata.xml

@@ -30,7 +30,7 @@
   <url type="donation">https://martinrotter.github.io/donate/</url>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="3.8.4" date="2021-02-12"/>
+    <release version="3.8.4" date="2021-02-15"/>
   </releases>
   <content_rating type="oars-1.0">
     <content_attribute id="violence-cartoon">none</content_attribute>

resources/scripts/7za

@@ -1 +1 @@
-Subproject commit 9c10723bfbaf6cb85107d6ee16e0324e9e487749
+Subproject commit 47f4125753452eff8800dbd6600c5a05540b15d9

src/librssguard/services/feedly/definitions.h

@@ -18,5 +18,6 @@
 #define FEEDLY_API_URL_AUTH       "auth/auth"
 #define FEEDLY_API_URL_TOKEN      "auth/token"
 #define FEEDLY_API_URL_PROFILE    "profile"
+#define FEEDLY_API_URL_COLLETIONS "collections"
 
 #endif // FEEDLY_DEFINITIONS_H

src/librssguard/services/feedly/feedlynetwork.cpp

@@ -44,13 +44,64 @@ FeedlyNetwork::FeedlyNetwork(QObject* parent)
 #endif
 }
 
-RootItem* FeedlyNetwork::personalCollections(bool obtain_icons, const QNetworkProxy& proxy) {
+RootItem* FeedlyNetwork::collections(bool obtain_icons) {
   QString bear = bearer();
 
   if (bear.isEmpty()) {
     qCriticalNN << LOGSEC_FEEDLY << "Cannot obtain personal collections, because bearer is empty.";
     throw NetworkException(QNetworkReply::NetworkError::AuthenticationRequiredError);
   }
+
+  QString target_url = fullUrl(Service::Collections);
+  int timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt();
+  QByteArray output_msgs;
+  auto result = NetworkFactory::performNetworkOperation(target_url,
+                                                        timeout,
+                                                        {},
+                                                        output_msgs,
+                                                        QNetworkAccessManager::Operation::GetOperation,
+                                                        { bearerHeader(bear) },
+                                                        false,
+                                                        {},
+                                                        {},
+                                                        m_service->networkProxy());
+
+  if (result.first != QNetworkReply::NetworkError::NoError) {
+    throw NetworkException(result.first);
+  }
+
+  return decodeCollections(output_msgs);
+}
+
+RootItem* FeedlyNetwork::decodeCollections(const QByteArray& json, bool obtain_url) const {
+  QJsonDocument doc = QJsonDocument::fromJson(json);
+  auto* parent = new RootItem();
+  QList<QString> used_feeds;
+
+  for (const QJsonValue& cat : doc.array()) {
+    QJsonObject cat_obj = cat.toObject();
+    auto* category = new Category(parent);
+
+    category->setTitle(cat_obj["label"].toString());
+    category->setCustomId(cat_obj["id"].toString());
+
+    for (const QJsonValue& fee : cat["feeds"].toArray()) {
+      QJsonObject fee_obj = fee.toObject();
+      auto* feed = new FeedlyFeed(category);
+
+      feed->setTitle(fee_obj["title"].toString());
+      feed->setDescription(fee_obj["description"].toString());
+      feed->setCustomId(fee_obj["id"].toString());
+
+      if (obtain_url) {
+        // TODO: TODO
+      }
+    }
+
+    parent->appendChild(category);
+  }
+
+  return parent;
 }
 
 QVariantHash FeedlyNetwork::profile(const QNetworkProxy& network_proxy) {
@@ -161,9 +212,12 @@ void FeedlyNetwork::setOauth(OAuth2Service* oauth) {
 
 QString FeedlyNetwork::fullUrl(FeedlyNetwork::Service service) const {
   switch (service) {
-    case FeedlyNetwork::Service::Profile:
+    case Service::Profile:
       return QSL(FEEDLY_API_URL_BASE) + FEEDLY_API_URL_PROFILE;
 
+    case Service::Collections:
+      return QSL(FEEDLY_API_URL_BASE) + FEEDLY_API_URL_COLLETIONS;
+
     default:
       return FEEDLY_API_URL_BASE;
   }

src/librssguard/services/feedly/feedlynetwork.h

@@ -23,6 +23,8 @@ class FeedlyNetwork : public QObject {
     // API operations.
     QVariantHash profile(const QNetworkProxy& network_proxy);
 
+    RootItem* collections(bool obtain_icons);
+
     // Getters and setters.
     QString username() const;
     void setUsername(const QString& username);
@@ -47,11 +49,13 @@ class FeedlyNetwork : public QObject {
 
   private:
     enum class Service {
-      Profile
+      Profile,
+      Collections
     };
 
     QString fullUrl(Service service) const;
     QString bearer() const;
+    RootItem* decodeCollections(const QByteArray& json, bool obtain_url) const;
     QPair<QByteArray, QByteArray> bearerHeader(const QString& bearer) const;
 
   private: