jeena/FeedTheMonkey
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

added post stuff

Browse source
This commit is contained in:
Jeena 2015-01-12 19:52:28 +01:00
parent 7dbf05e2e1
commit 6146758f59
4 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
post.cpp
View file

@ -7,7 +7,7 @@ Post::Post(QObject *parent) : QObject(parent),
} }
Post::Post(QJsonDocument post, QObject *parent) : QObject(parent), Post::Post(QJsonObject post, QObject *parent) : QObject(parent),
mStarred(false) mStarred(false)
{ {
qDebug() << post; qDebug() << post;

4
post.h
View file

@ -4,7 +4,7 @@
#include <QObject> #include <QObject>
#include <QUrl> #include <QUrl>
#include <QDate> #include <QDate>
#include <QJsonDocument> #include <QJsonObject>
class Post : public QObject class Post : public QObject
{ {
@ -18,7 +18,7 @@ class Post : public QObject
public: public:
Post(QObject *parent = 0); Post(QObject *parent = 0);
Post(QJsonDocument post, QObject *parent = 0); Post(QJsonObject post, QObject *parent = 0);
~Post(); ~Post();
QString title() const { return mTitle; } QString title() const { return mTitle; }
QString author() const { return mAuthor; } QString author() const { return mAuthor; }

33
tinytinyrss.cpp
View file

@ -3,17 +3,26 @@
#include <QJsonObject> #include <QJsonObject>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QNetworkRequest> #include <QNetworkRequest>
#include <QJsonArray>
TinyTinyRSS::TinyTinyRSS(QObject *parent) : TinyTinyRSS::TinyTinyRSS(QObject *parent) :
QObject(parent) QObject(parent)
{ {
mNetworkManager = new QNetworkAccessManager(this); mNetworkManager = new QNetworkAccessManager(this);
mPosts = QList<Post*>();
}
TinyTinyRSS::~TinyTinyRSS()
{
mPosts.empty();
delete mNetworkManager;
} }
void TinyTinyRSS::initialize(const QString serverUrl, const QString sessionId) void TinyTinyRSS::initialize(const QString serverUrl, const QString sessionId)
{ {
mServerUrl = serverUrl; mServerUrl = serverUrl;
mSessionId = sessionId; mSessionId = sessionId;
reload();
} }
void TinyTinyRSS::reload() void TinyTinyRSS::reload()
@ -28,11 +37,6 @@ void TinyTinyRSS::reload()
doOperation("getHeadlines", opts); doOperation("getHeadlines", opts);
} }
TinyTinyRSS::~TinyTinyRSS()
{
delete mNetworkManager;
}
void TinyTinyRSS::doOperation(QString operation, QVariantMap opts) void TinyTinyRSS::doOperation(QString operation, QVariantMap opts)
{ {
QVariantMap options; QVariantMap options;
@ -49,9 +53,9 @@ void TinyTinyRSS::doOperation(QString operation, QVariantMap opts)
QJsonDocument json = QJsonDocument(jsonobj); QJsonDocument json = QJsonDocument(jsonobj);
QNetworkRequest request(mServerUrl); QNetworkRequest request(mServerUrl);
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded"); request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
QNetworkReply *reply = mNetworkManager->post(request, json.toBinaryData()); QNetworkReply *reply = mNetworkManager->post(request, json.toJson());
connect(reply, SIGNAL(finished()), this, SLOT(reply())); connect(reply, SIGNAL(finished()), this, SLOT(reply()));
} }
@ -61,9 +65,18 @@ void TinyTinyRSS::reply()
if (reply) { if (reply) {
if (reply->error() == QNetworkReply::NoError) { if (reply->error() == QNetworkReply::NoError) {
//QJsonDocument json = QJsonDocument::fromBinaryData(reply->readAll()); QString jsonString = QString(reply->readAll());
//mSessionId = json.toVariant().toMap().value("session_id"); QJsonDocument json = QJsonDocument::fromJson(jsonString.toUtf8());
//emit sessionIdChanged(mSessionId);
QJsonArray posts = json.object().value("content").toArray();
for(int i = 0; posts.count(); i++)
{
QJsonObject postJson = posts.at(i).toObject();
Post *post = new Post(postJson, this);
mPosts.append(post);
}
emit postsChanged(mPosts);
} else { } else {
int httpStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); int httpStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
//do some error management //do some error management

7
tinytinyrsslogin.cpp
View file

@ -39,10 +39,9 @@ void TinyTinyRSSLogin::reply()
if (reply) { if (reply) {
if (reply->error() == QNetworkReply::NoError) { if (reply->error() == QNetworkReply::NoError) {
QJsonDocument jdoc = QJsonDocument::fromBinaryData(reply->readAll()); QString jsonString = QString(reply->readAll());
qDebug() << jdoc; QJsonDocument json = QJsonDocument::fromJson(jsonString.toUtf8());
//mSessionId = json.toVariant().toMap().value("session_id").toString(); mSessionId = json.object().value("content").toObject().value("session_id").toString();
//qDebug() << "sessionId: " << mSessionId;
emit sessionIdChanged(mSessionId); emit sessionIdChanged(mSessionId);
} else { } else {
int httpStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); int httpStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();