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

Working loading of stored OC contents from DB.

Browse Source
This commit is contained in:
Martin Rotter 2016-02-19 09:26:38 +01:00
parent f9f461d1a3
commit e98172afaa
12 changed files with 82 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/services/owncloud/owncloudcategory.cpp
View File

@ -26,5 +26,12 @@ OwnCloudCategory::OwnCloudCategory(RootItem *parent) : Category(parent) {
setIcon(qApp->icons()->fromTheme(QSL("folder-category")));
}
OwnCloudCategory::OwnCloudCategory(const QSqlRecord &record) : Category(NULL) {
setIcon(qApp->icons()->fromTheme(QSL("folder-category")));
setId(record.value(CAT_DB_ID_INDEX).toInt());
setTitle(record.value(CAT_DB_TITLE_INDEX).toString());
setCustomId(record.value(CAT_DB_CUSTOM_ID_INDEX).toInt());
}
OwnCloudCategory::~OwnCloudCategory() {
}

1
src/services/owncloud/owncloudcategory.h
View File

@ -24,6 +24,7 @@
class OwnCloudCategory : public Category {
public:
explicit OwnCloudCategory(RootItem *parent = NULL);
explicit OwnCloudCategory(const QSqlRecord &record);
virtual ~OwnCloudCategory();
};

11
src/services/owncloud/owncloudfeed.cpp
View File

@ -17,10 +17,21 @@
#include "owncloudfeed.h"
#include "miscellaneous/iconfactory.h"
OwnCloudFeed::OwnCloudFeed(RootItem *parent) : Feed(parent) {
}
OwnCloudFeed::OwnCloudFeed(const QSqlRecord &record) : Feed(NULL) {
setTitle(record.value(FDS_DB_TITLE_INDEX).toString());
setId(record.value(FDS_DB_ID_INDEX).toInt());
setIcon(qApp->icons()->fromByteArray(record.value(FDS_DB_ICON_INDEX).toByteArray()));
setAutoUpdateType(static_cast<Feed::AutoUpdateType>(record.value(FDS_DB_UPDATE_TYPE_INDEX).toInt()));
setAutoUpdateInitialInterval(record.value(FDS_DB_UPDATE_INTERVAL_INDEX).toInt());
setCustomId(record.value(FDS_DB_CUSTOM_ID_INDEX).toInt());
}
OwnCloudFeed::~OwnCloudFeed() {
}

1
src/services/owncloud/owncloudfeed.h
View File

@ -24,6 +24,7 @@
class OwnCloudFeed : public Feed {
public:
explicit OwnCloudFeed(RootItem *parent = NULL);
explicit OwnCloudFeed(const QSqlRecord &record);
virtual ~OwnCloudFeed();
int update();

6
src/services/owncloud/owncloudrecyclebin.cpp
View File

@ -17,6 +17,8 @@
#include "services/owncloud/owncloudrecyclebin.h"
#include "services/owncloud/owncloudserviceroot.h"
OwnCloudRecycleBin::OwnCloudRecycleBin(RootItem *parent) : RecycleBin(parent) {
}
@ -24,6 +26,10 @@ OwnCloudRecycleBin::OwnCloudRecycleBin(RootItem *parent) : RecycleBin(parent) {
OwnCloudRecycleBin::~OwnCloudRecycleBin() {
}
OwnCloudServiceRoot *OwnCloudRecycleBin::serviceRoot() {
return qobject_cast<OwnCloudServiceRoot*>(getParentServiceRoot());
}
bool OwnCloudRecycleBin::markAsReadUnread(RootItem::ReadStatus status) {
// TODO: proved zmenu online.
/*QStringList ids = serviceRoot()->customIDSOfMessagesForItem(this);

3
src/services/owncloud/owncloudrecyclebin.h
View File

@ -21,11 +21,14 @@
#include "services/abstract/recyclebin.h"
class OwnCloudServiceRoot;
class OwnCloudRecycleBin : public RecycleBin {
public:
explicit OwnCloudRecycleBin(RootItem *parent = NULL);
virtual ~OwnCloudRecycleBin();
OwnCloudServiceRoot *serviceRoot();
bool markAsReadUnread(ReadStatus status);
};

56
src/services/owncloud/owncloudserviceroot.cpp
View File

@ -24,6 +24,8 @@
#include "miscellaneous/iconfactory.h"
#include "services/owncloud/owncloudserviceentrypoint.h"
#include "services/owncloud/owncloudrecyclebin.h"
#include "services/owncloud/owncloudfeed.h"
#include "services/owncloud/owncloudcategory.h"
#include "services/owncloud/network/owncloudnetworkfactory.h"
#include <QSqlQuery>
@ -90,16 +92,10 @@ void OwnCloudServiceRoot::start(bool freshly_activated) {
}
void OwnCloudServiceRoot::stop() {
// TODO: TODO
}
QString OwnCloudServiceRoot::code() const {
return SERVICE_CODE_OWNCLOUD;
}
bool OwnCloudServiceRoot::loadMessagesForItem(RootItem *item, QSqlTableModel *model) {
// TODO: TODO
return false;
return OwnCloudServiceEntryPoint().code();
}
OwnCloudNetworkFactory *OwnCloudServiceRoot::network() const {
@ -157,7 +153,7 @@ void OwnCloudServiceRoot::saveAccountDataToDatabase() {
query.prepare(QSL("INSERT INTO Accounts (id, type) VALUES (:id, :type);"));
query.bindValue(QSL(":id"), id_to_assign);
query.bindValue(QSL(":type"), SERVICE_CODE_OWNCLOUD);
query.bindValue(QSL(":type"), code());
saved &= query.exec();
@ -246,6 +242,50 @@ void OwnCloudServiceRoot::syncIn() {
}
void OwnCloudServiceRoot::loadFromDatabase() {
QSqlDatabase database = qApp->database()->connection(metaObject()->className(), DatabaseFactory::FromSettings);
Assignment categories;
Assignment feeds;
// Obtain data for categories from the database.
QSqlQuery query_categories(database);
query_categories.setForwardOnly(true);
query_categories.prepare(QSL("SELECT * FROM Categories WHERE account_id = :account_id;"));
query_categories.bindValue(QSL(":account_id"), accountId());
if (!query_categories.exec()) {
qFatal("Query for obtaining categories failed. Error message: '%s'.", qPrintable(query_categories.lastError().text()));
}
while (query_categories.next()) {
AssignmentItem pair;
pair.first = query_categories.value(CAT_DB_PARENT_ID_INDEX).toInt();
pair.second = new OwnCloudCategory(query_categories.record());
categories << pair;
}
// All categories are now loaded.
QSqlQuery query_feeds(database);
query_feeds.setForwardOnly(true);
query_feeds.prepare(QSL("SELECT * FROM Feeds WHERE account_id = :account_id;"));
query_feeds.bindValue(QSL(":account_id"), accountId());
if (!query_feeds.exec()) {
qFatal("Query for obtaining feeds failed. Error message: '%s'.", qPrintable(query_feeds.lastError().text()));
}
while (query_feeds.next()) {
AssignmentItem pair;
pair.first = query_feeds.value(FDS_DB_CATEGORY_INDEX).toInt();
pair.second = new OwnCloudFeed(query_feeds.record());
feeds << pair;
}
// All data are now obtained, lets create the hierarchy.
assembleCategories(categories);
assembleFeeds(feeds);
// As the last item, add recycle bin, which is needed.
appendChild(m_recycleBin);
m_recycleBin->updateCounts(true);

5
src/services/owncloud/owncloudserviceroot.h
View File

@ -35,19 +35,14 @@ class OwnCloudServiceRoot : public ServiceRoot {
bool canBeDeleted() const;
bool editViaGui();
bool deleteViaGui();
bool supportsFeedAdding() const;
bool supportsCategoryAdding() const;
QList<QAction*> serviceMenu();
RecycleBin *recycleBin() const;
void start(bool freshly_activated);
void stop();
QString code() const;
bool loadMessagesForItem(RootItem *item, QSqlTableModel *model);
OwnCloudNetworkFactory *network() const;
void updateTitle();

4
src/services/standard/standardserviceentrypoint.cpp
View File

@ -73,7 +73,7 @@ ServiceRoot *StandardServiceEntryPoint::createNewRoot() const {
query.prepare(QSL("INSERT INTO Accounts (id, type) VALUES (:id, :type);"));
query.bindValue(QSL(":id"), id_to_assign);
query.bindValue(QSL(":type"), SERVICE_CODE_STD_RSS);
query.bindValue(QSL(":type"), code());
if (query.exec()) {
StandardServiceRoot *root = new StandardServiceRoot();
@ -94,7 +94,7 @@ QList<ServiceRoot*> StandardServiceEntryPoint::initializeSubtree() const {
query.setForwardOnly(true);
query.prepare(QSL("SELECT id FROM Accounts WHERE type = :type;"));
query.bindValue(QSL(":type"), SERVICE_CODE_STD_RSS);
query.bindValue(QSL(":type"), code());
if (query.exec()) {
while (query.next()) {

2
src/services/standard/standardserviceroot.cpp
View File

@ -103,7 +103,7 @@ void StandardServiceRoot::stop() {
}
QString StandardServiceRoot::code() const {
return SERVICE_CODE_STD_RSS;
return StandardServiceEntryPoint().code();
}
bool StandardServiceRoot::canBeEdited() const {

1
src/services/tt-rss/ttrssrecyclebin.h
View File

@ -31,7 +31,6 @@ class TtRssRecycleBin : public RecycleBin {
virtual ~TtRssRecycleBin();
TtRssServiceRoot *serviceRoot();
bool markAsReadUnread(ReadStatus status);
};

4
src/services/tt-rss/ttrssserviceroot.cpp
View File

@ -65,7 +65,7 @@ void TtRssServiceRoot::stop() {
}
QString TtRssServiceRoot::code() const {
return SERVICE_CODE_TT_RSS;
return TtRssServiceEntryPoint().code();
}
bool TtRssServiceRoot::editViaGui() {
@ -406,7 +406,7 @@ void TtRssServiceRoot::saveAccountDataToDatabase() {
query.prepare(QSL("INSERT INTO Accounts (id, type) VALUES (:id, :type);"));
query.bindValue(QSL(":id"), id_to_assign);
query.bindValue(QSL(":type"), SERVICE_CODE_TT_RSS);
query.bindValue(QSL(":type"), code());
saved &= query.exec();