added post

FeedMonkey.pro

@@ -4,7 +4,8 @@ QT += qml quick
 
 SOURCES += main.cpp \
     tinytinyrss.cpp \
-    tinytinyrsslogin.cpp
+    tinytinyrsslogin.cpp \
+    post.cpp
 
 RESOURCES += qml.qrc \
     html.qrc
@@ -25,4 +26,5 @@ OTHER_FILES += \
 
 HEADERS += \
     tinytinyrss.h \
-    tinytinyrsslogin.h
+    tinytinyrsslogin.h \
+    post.h

main.cpp

@@ -5,13 +5,16 @@
 #include <QtQml>
 
 #include "tinytinyrsslogin.h"
+#include "tinytinyrss.h"
+#include "post.h"
 
 int main(int argc, char *argv[])
 {
     QGuiApplication app(argc, argv);
 
     qmlRegisterType<TinyTinyRSSLogin>("TTRSS", 1, 0, "ServerLogin");
-    // qmlRegisterType<TinyTinyRSS>("TTRSS", 1, 0, "Server");
+    qmlRegisterType<TinyTinyRSS>("TTRSS", 1, 0, "Server");
+    qmlRegisterType<Post>("TTRSS", 1, 0, "Post");
 
     QQmlApplicationEngine engine;
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));

main.qml

@@ -28,6 +28,13 @@ ApplicationWindow {
 
     ServerLogin {
         id: serverLogin
-        onSessionIdChanged: login.visible = false
+        onSessionIdChanged: {
+            login.visible = false;
+            server.initialize(serverUrl. sessionId);
+        }
+    }
+
+    Server {
+        id: server
     }
 }

post.cpp

@@ -0,0 +1,20 @@
+#include "post.h"
+#include <QDebug>
+
+Post::Post(QObject *parent) : QObject(parent),
+    mStarred(false)
+{
+
+}
+
+Post::Post(QJsonDocument post, QObject *parent) : QObject(parent),
+    mStarred(false)
+{
+    qDebug() << post;
+}
+
+Post::~Post()
+{
+
+}
+

post.h

@@ -0,0 +1,44 @@
+#ifndef POST_H
+#define POST_H
+
+#include <QObject>
+#include <QUrl>
+#include <QDate>
+#include <QJsonDocument>
+
+class Post : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString title READ title)
+    Q_PROPERTY(QString author READ author)
+    Q_PROPERTY(QUrl link READ link)
+    Q_PROPERTY(QDate date READ date)
+    Q_PROPERTY(QString content READ content)
+    Q_PROPERTY(bool starred READ starred NOTIFY starredChanged)
+
+public:
+    Post(QObject *parent = 0);
+    Post(QJsonDocument post, QObject *parent = 0);
+    ~Post();
+    QString title() const { return mTitle; }
+    QString author() const { return mAuthor; }
+    QUrl link() const { return mLink; }
+    QDate date() const { return mDate; }
+    QString content() const { return mContent; }
+    bool starred() const { return mStarred; }
+
+signals:
+    void starredChanged(bool);
+
+public slots:
+
+private:
+    QString mTitle;
+    QString mAuthor;
+    QUrl mLink;
+    QDate mDate;
+    QString mContent;
+    bool mStarred;
+};
+
+#endif // POST_H

tinytinyrss.cpp

@@ -4,20 +4,27 @@
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
 
-TinyTinyRSS::TinyTinyRSS(QString serverUrl, QString sessionId)
+TinyTinyRSS::TinyTinyRSS(QObject *parent) :
+    QObject(parent)
 {
-    this->serverUrl = serverUrl;
+    mNetworkManager = new QNetworkAccessManager(this);
-    this->sessionId = sessionId;
+}
+
+void TinyTinyRSS::initialize(const QString serverUrl, const QString sessionId)
+{
+    mServerUrl = serverUrl;
+    mSessionId = sessionId;
 }
 
 TinyTinyRSS::~TinyTinyRSS()
 {
-
+    delete mNetworkManager;
 }
 
-void TinyTinyRSS::doOperation(QString operation, QVariantMap opts) {
+void TinyTinyRSS::doOperation(QString operation, QVariantMap opts)
+{
     QVariantMap options;
-    options.insert("sid", this->sessionId);
+    options.insert("sid", mSessionId);
     options.insert("op", operation);
 
     QMapIterator<QString, QVariant> i(opts);
@@ -29,16 +36,27 @@ void TinyTinyRSS::doOperation(QString operation, QVariantMap opts) {
     QJsonObject jsonobj = QJsonObject::fromVariantMap(options);
     QJsonDocument json = QJsonDocument(jsonobj);
 
-    QNetworkAccessManager *manager = new QNetworkAccessManager(this);
+    QNetworkRequest request(mServerUrl);
-
-    QUrl url(this->serverUrl + "/api/");
-    QNetworkRequest request(url);
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
 
-    QObject::connect(manager, SIGNAL(finished(QNetworkReply)), this, SIGNAL(replyFinishedOperation(QNetworkReply)));
+    QNetworkReply *reply = mNetworkManager->post(request, json.toBinaryData());
-    manager->post(request, json.toBinaryData());
+    connect(reply, SIGNAL(finished()), this, SLOT(reply()));
 }
 
-void TinyTinyRSS::replyFinishedOperation(QNetworkReply *reply) {
+void TinyTinyRSS::reply()
-    qWarning() << reply;
+{
+    QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
+
+    if (reply) {
+        if (reply->error() == QNetworkReply::NoError) {
+            //QJsonDocument json = QJsonDocument::fromBinaryData(reply->readAll());
+            //mSessionId = json.toVariant().toMap().value("session_id");
+            //emit sessionIdChanged(mSessionId);
+        } else {
+            int httpStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+            //do some error management
+            qWarning() << "HTTP error: " << httpStatus;
+        }
+        reply->deleteLater();
+    }
 }

tinytinyrss.h

@@ -2,25 +2,38 @@
 #define TINYTINYRSS_H
 
 #include <QObject>
-#include <QQuickItem>
 #include <QMap>
 #include <QNetworkReply>
+#include <QList>
 
-class TinyTinyRSS : QObject
+#include "post.h"
+
+class TinyTinyRSS : public QObject
 {
     Q_OBJECT
+    Q_PROPERTY(QList<Post> posts READ posts NOTIFY postsChanged)
 
 public:
-    TinyTinyRSS(QString serverUrl, QString sessionId);
+    TinyTinyRSS(QObject *parent = 0);
     ~TinyTinyRSS();
-    void login();
+    QList<Post> posts() const;
-    void replyFinishedOperation(QNetworkReply *reply);
+
+    Q_INVOKABLE void initialize(const QString serverUrl, const QString sessionId);
+    Q_INVOKABLE void reload();
+
+signals:
+    void postsChanged(QList<Post>);
+
+private slots:
+    void reply();
 
 private:
-    QString serverUrl;
-    QString sessionId;
-
     void doOperation(QString operation, QVariantMap opts);
+
+    QString mServerUrl;
+    QString mSessionId;
+    QList<Post> mPosts;
+    QNetworkAccessManager *mNetworkManager;
 };
 
 #endif // TINYTINYRSS_H

tinytinyrsslogin.cpp

@@ -39,14 +39,14 @@ void TinyTinyRSSLogin::reply()
 
     if (reply) {
         if (reply->error() == QNetworkReply::NoError) {
-        //read data from reply
+            QJsonDocument json = QJsonDocument::fromBinaryData(reply->readAll());
+            mSessionId = json.toVariant().toMap().value("session_id").toString();
+            emit sessionIdChanged(mSessionId);
         } else {
-        //get http status code
+            int httpStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-        int httpStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+            //do some error management
-        //do some error management
+            qWarning() << "HTTP error: " << httpStatus;
         }
         reply->deleteLater();
     }
-    mSessionId = "1234";
-    emit sessionIdChanged(mSessionId);
 }

tinytinyrsslogin.h

@@ -30,7 +30,6 @@ private:
     QString mSessionId;
     QUrl mServerUrl;
     QNetworkAccessManager *mNetworkManager;
-
 };
 
 #endif // TINYTINYRSSLOGIN_H