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

Cleanups in SQL loading feeds/categories.

Browse Source
This commit is contained in:
Martin Rotter 2017-09-26 08:48:10 +02:00
parent 09f6828ee1
commit c61223d01a
5 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/services/abstract/category.cpp
View File

@ -52,7 +52,6 @@ Category::Category(const QSqlRecord& record) : Category(nullptr) {
setTitle(record.value(CAT_DB_TITLE_INDEX).toString()); setTitle(record.value(CAT_DB_TITLE_INDEX).toString());
setDescription(record.value(CAT_DB_DESCRIPTION_INDEX).toString()); setDescription(record.value(CAT_DB_DESCRIPTION_INDEX).toString());
setCreationDate(TextFactory::parseDateTime(record.value(CAT_DB_DCREATED_INDEX).value<qint64>()).toLocalTime()); setCreationDate(TextFactory::parseDateTime(record.value(CAT_DB_DCREATED_INDEX).value<qint64>()).toLocalTime());
QIcon loaded_icon = qApp->icons()->fromByteArray(record.value(CAT_DB_ICON_INDEX).toByteArray()); QIcon loaded_icon = qApp->icons()->fromByteArray(record.value(CAT_DB_ICON_INDEX).toByteArray());

9
src/services/abstract/feed.cpp
View File

@ -24,6 +24,7 @@
#include "miscellaneous/feedreader.h" #include "miscellaneous/feedreader.h"
#include "miscellaneous/iconfactory.h" #include "miscellaneous/iconfactory.h"
#include "miscellaneous/mutex.h" #include "miscellaneous/mutex.h"
#include "miscellaneous/textfactory.h"
#include "services/abstract/cacheforserviceroot.h" #include "services/abstract/cacheforserviceroot.h"
#include "services/abstract/recyclebin.h" #include "services/abstract/recyclebin.h"
#include "services/abstract/serviceroot.h" #include "services/abstract/serviceroot.h"
@ -41,7 +42,15 @@ Feed::Feed(RootItem* parent)
Feed::Feed(const QSqlRecord& record) : Feed(nullptr) { Feed::Feed(const QSqlRecord& record) : Feed(nullptr) {
setTitle(record.value(FDS_DB_TITLE_INDEX).toString()); setTitle(record.value(FDS_DB_TITLE_INDEX).toString());
setId(record.value(FDS_DB_ID_INDEX).toInt()); setId(record.value(FDS_DB_ID_INDEX).toInt());
setUrl(record.value(FDS_DB_URL_INDEX).toString());
setCustomId(record.value(FDS_DB_CUSTOM_ID_INDEX).toString()); setCustomId(record.value(FDS_DB_CUSTOM_ID_INDEX).toString());
if (customId().isEmpty()) {
setCustomId(QString::number(id()));
}
setDescription(QString::fromUtf8(record.value(FDS_DB_DESCRIPTION_INDEX).toByteArray()));
setCreationDate(TextFactory::parseDateTime(record.value(FDS_DB_DCREATED_INDEX).value<qint64>()).toLocalTime());
setIcon(qApp->icons()->fromByteArray(record.value(FDS_DB_ICON_INDEX).toByteArray())); setIcon(qApp->icons()->fromByteArray(record.value(FDS_DB_ICON_INDEX).toByteArray()));
setAutoUpdateType(static_cast<Feed::AutoUpdateType>(record.value(FDS_DB_UPDATE_TYPE_INDEX).toInt())); setAutoUpdateType(static_cast<Feed::AutoUpdateType>(record.value(FDS_DB_UPDATE_TYPE_INDEX).toInt()));
setAutoUpdateInitialInterval(record.value(FDS_DB_UPDATE_INTERVAL_INDEX).toInt()); setAutoUpdateInitialInterval(record.value(FDS_DB_UPDATE_INTERVAL_INDEX).toInt());

10
src/services/inoreader/inoreaderfeed.cpp Normal file → Executable file
View File

@ -24,15 +24,7 @@
InoreaderFeed::InoreaderFeed(RootItem* parent) : Feed(parent) {} InoreaderFeed::InoreaderFeed(RootItem* parent) : Feed(parent) {}
InoreaderFeed::InoreaderFeed(const QSqlRecord& record) : InoreaderFeed(nullptr) { InoreaderFeed::InoreaderFeed(const QSqlRecord& record) : InoreaderFeed(record) {}
setTitle(record.value(FDS_DB_TITLE_INDEX).toString());
setId(record.value(FDS_DB_ID_INDEX).toInt());
setCustomId(record.value(FDS_DB_CUSTOM_ID_INDEX).toString());
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());
qDebug("Custom ID of Inoreader feed when loading from DB is '%s'.", qPrintable(customId()));
}
InoreaderServiceRoot* InoreaderFeed::serviceRoot() const { InoreaderServiceRoot* InoreaderFeed::serviceRoot() const {
return qobject_cast<InoreaderServiceRoot*>(getParentServiceRoot()); return qobject_cast<InoreaderServiceRoot*>(getParentServiceRoot());

7
src/services/standard/standardcategory.cpp
View File

@ -34,12 +34,9 @@
StandardCategory::StandardCategory(RootItem* parent_item) : Category(parent_item) {} StandardCategory::StandardCategory(RootItem* parent_item) : Category(parent_item) {}
StandardCategory::StandardCategory(const StandardCategory& other) StandardCategory::StandardCategory(const StandardCategory& other) : Category(other) {}
: Category(other) {}
StandardCategory::~StandardCategory() { StandardCategory::~StandardCategory() {}
qDebug("Destroying Category instance.");
}
StandardServiceRoot* StandardCategory::serviceRoot() const { StandardServiceRoot* StandardCategory::serviceRoot() const {
return qobject_cast<StandardServiceRoot*>(getParentServiceRoot()); return qobject_cast<StandardServiceRoot*>(getParentServiceRoot());

9
src/services/standard/standardfeed.cpp
View File

@ -486,15 +486,8 @@ QNetworkReply::NetworkError StandardFeed::networkError() const {
return m_networkError; return m_networkError;
} }
StandardFeed::StandardFeed(const QSqlRecord& record) : Feed(nullptr) { StandardFeed::StandardFeed(const QSqlRecord& record) : Feed(record) {
setTitle(QString::fromUtf8(record.value(FDS_DB_TITLE_INDEX).toByteArray()));
setId(record.value(FDS_DB_ID_INDEX).toInt());
setCustomId(QString::number(id()));
setDescription(QString::fromUtf8(record.value(FDS_DB_DESCRIPTION_INDEX).toByteArray()));
setCreationDate(TextFactory::parseDateTime(record.value(FDS_DB_DCREATED_INDEX).value<qint64>()).toLocalTime());
setIcon(qApp->icons()->fromByteArray(record.value(FDS_DB_ICON_INDEX).toByteArray()));
setEncoding(record.value(FDS_DB_ENCODING_INDEX).toString()); setEncoding(record.value(FDS_DB_ENCODING_INDEX).toString());
setUrl(record.value(FDS_DB_URL_INDEX).toString());
setPasswordProtected(record.value(FDS_DB_PROTECTED_INDEX).toBool()); setPasswordProtected(record.value(FDS_DB_PROTECTED_INDEX).toBool());
setUsername(record.value(FDS_DB_USERNAME_INDEX).toString()); setUsername(record.value(FDS_DB_USERNAME_INDEX).toString());