From c61223d01aa3aecc9d50b155138edd52e84200bb Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Tue, 26 Sep 2017 08:48:10 +0200
Subject: [PATCH] Cleanups in SQL loading feeds/categories.

---
 src/services/abstract/category.cpp         |  1 -
 src/services/abstract/feed.cpp             |  9 +++++++++
 src/services/inoreader/inoreaderfeed.cpp   | 10 +---------
 src/services/standard/standardcategory.cpp |  7 ++-----
 src/services/standard/standardfeed.cpp     |  9 +--------
 5 files changed, 13 insertions(+), 23 deletions(-)
 mode change 100644 => 100755 src/services/inoreader/inoreaderfeed.cpp

diff --git a/src/services/abstract/category.cpp b/src/services/abstract/category.cpp
index ed0d82d26..62fa6769b 100755
--- a/src/services/abstract/category.cpp
+++ b/src/services/abstract/category.cpp
@@ -52,7 +52,6 @@ Category::Category(const QSqlRecord& record) : Category(nullptr) {
 
   setTitle(record.value(CAT_DB_TITLE_INDEX).toString());
   setDescription(record.value(CAT_DB_DESCRIPTION_INDEX).toString());
-
   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());
diff --git a/src/services/abstract/feed.cpp b/src/services/abstract/feed.cpp
index 502529391..96fa2b20b 100755
--- a/src/services/abstract/feed.cpp
+++ b/src/services/abstract/feed.cpp
@@ -24,6 +24,7 @@
 #include "miscellaneous/feedreader.h"
 #include "miscellaneous/iconfactory.h"
 #include "miscellaneous/mutex.h"
+#include "miscellaneous/textfactory.h"
 #include "services/abstract/cacheforserviceroot.h"
 #include "services/abstract/recyclebin.h"
 #include "services/abstract/serviceroot.h"
@@ -41,7 +42,15 @@ Feed::Feed(RootItem* parent)
 Feed::Feed(const QSqlRecord& record) : Feed(nullptr) {
   setTitle(record.value(FDS_DB_TITLE_INDEX).toString());
   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());
+
+  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()));
   setAutoUpdateType(static_cast<Feed::AutoUpdateType>(record.value(FDS_DB_UPDATE_TYPE_INDEX).toInt()));
   setAutoUpdateInitialInterval(record.value(FDS_DB_UPDATE_INTERVAL_INDEX).toInt());
diff --git a/src/services/inoreader/inoreaderfeed.cpp b/src/services/inoreader/inoreaderfeed.cpp
old mode 100644
new mode 100755
index cf2b8dcc9..7a4af10d5
--- a/src/services/inoreader/inoreaderfeed.cpp
+++ b/src/services/inoreader/inoreaderfeed.cpp
@@ -24,15 +24,7 @@
 
 InoreaderFeed::InoreaderFeed(RootItem* parent) : Feed(parent) {}
 
-InoreaderFeed::InoreaderFeed(const QSqlRecord& record) : InoreaderFeed(nullptr) {
-  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()));
-}
+InoreaderFeed::InoreaderFeed(const QSqlRecord& record) : InoreaderFeed(record) {}
 
 InoreaderServiceRoot* InoreaderFeed::serviceRoot() const {
   return qobject_cast<InoreaderServiceRoot*>(getParentServiceRoot());
diff --git a/src/services/standard/standardcategory.cpp b/src/services/standard/standardcategory.cpp
index a39b5e6b8..4a9170ff2 100755
--- a/src/services/standard/standardcategory.cpp
+++ b/src/services/standard/standardcategory.cpp
@@ -34,12 +34,9 @@
 
 StandardCategory::StandardCategory(RootItem* parent_item) : Category(parent_item) {}
 
-StandardCategory::StandardCategory(const StandardCategory& other)
-  : Category(other) {}
+StandardCategory::StandardCategory(const StandardCategory& other) : Category(other) {}
 
-StandardCategory::~StandardCategory() {
-  qDebug("Destroying Category instance.");
-}
+StandardCategory::~StandardCategory() {}
 
 StandardServiceRoot* StandardCategory::serviceRoot() const {
   return qobject_cast<StandardServiceRoot*>(getParentServiceRoot());
diff --git a/src/services/standard/standardfeed.cpp b/src/services/standard/standardfeed.cpp
index c0ae055bf..9a84c9fb0 100755
--- a/src/services/standard/standardfeed.cpp
+++ b/src/services/standard/standardfeed.cpp
@@ -486,15 +486,8 @@ QNetworkReply::NetworkError StandardFeed::networkError() const {
   return m_networkError;
 }
 
-StandardFeed::StandardFeed(const QSqlRecord& record) : Feed(nullptr) {
-  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()));
+StandardFeed::StandardFeed(const QSqlRecord& record) : Feed(record) {
   setEncoding(record.value(FDS_DB_ENCODING_INDEX).toString());
-  setUrl(record.value(FDS_DB_URL_INDEX).toString());
   setPasswordProtected(record.value(FDS_DB_PROTECTED_INDEX).toBool());
   setUsername(record.value(FDS_DB_USERNAME_INDEX).toString());