Fixed #43.

resources/text/CHANGELOG

@@ -1,3 +1,13 @@
+3.3.5
+—————
+
+Added:
+
+Changed:
+▪ Made some tweaks regarding bug #41. Number of new messages is now determined in feed downloader working thread too.
+
+Fixed:
+
 3.3.4
 —————
 

rssguard.pro

@@ -73,7 +73,7 @@ APP_LOW_NAME                  = "rssguard"
 APP_LOW_H_NAME                = ".rssguard"
 APP_AUTHOR                    = "Martin Rotter"
 APP_COPYRIGHT                 = "(C) 2011-2016 $$APP_AUTHOR"
-APP_VERSION                   = "3.3.4"
+APP_VERSION                   = "3.3.5"
 APP_LONG_NAME                 = "$$APP_NAME $$APP_VERSION"
 APP_EMAIL                     = "rotter.martinos@gmail.com"
 APP_URL                       = "https://github.com/martinrotter/rssguard"

src/core/feeddownloader.cpp

@@ -106,11 +106,13 @@ void FeedDownloader::oneFeedUpdateFinished(const QList<Message> &messages) {
                      << feed->id() << " in thread: \'"
                      << QThread::currentThreadId() << "\'.";
 
-  int updated_messages;
+  int updated_messages = feed->updateMessages(messages);
 
+  /*
   QMetaObject::invokeMethod(feed, "updateMessages", Qt::BlockingQueuedConnection,
                             Q_RETURN_ARG(int, updated_messages),
                             Q_ARG(QList<Message>, messages));
+  */
 
   if (updated_messages > 0) {
     m_results.appendUpdatedFeed(QPair<QString,int>(feed->title(), updated_messages));

src/main.cpp

@@ -38,7 +38,6 @@
 #include <QDebug>
 #include <QTimer>
 
-
 int main(int argc, char *argv[]) {
   for (int i = 0; i < argc; i++) {
     const QString str = QString::fromLocal8Bit(argv[i]);

src/services/abstract/feed.cpp

@@ -49,16 +49,16 @@ QVariant Feed::data(int column, int role) const {
       switch (status()) {
         case NewMessages:
           return QColor(Qt::blue);
-
+          
         case Error:
         case ParsingError:
         case OtherError:
           return QColor(Qt::red);
-
+          
         default:
           return QVariant();
       }
-
+      
     default:
       return RootItem::data(column, role);
   }
@@ -84,7 +84,7 @@ void Feed::setCountOfUnreadMessages(int count_unread_messages) {
   if (status() == NewMessages && count_unread_messages < countOfUnreadMessages()) {
     setStatus(Normal);
   }
-
+  
   m_unreadCount = count_unread_messages;
 }
 
@@ -128,13 +128,16 @@ void Feed::setUrl(const QString &url) {
 }
 
 void Feed::updateCounts(bool including_total_count) {
-  QSqlDatabase database = qApp->database()->connection(metaObject()->className(), DatabaseFactory::FromSettings);
+  bool is_main_thread = QThread::currentThread() == qApp->thread();
+  QSqlDatabase database = is_main_thread ?
+                            qApp->database()->connection(metaObject()->className(), DatabaseFactory::FromSettings) :
+                            qApp->database()->connection(QSL("feed_upd"), DatabaseFactory::FromSettings);
   int account_id = getParentServiceRoot()->accountId();
-
+  
   if (including_total_count) {
     setCountOfAllMessages(DatabaseQueries::getMessageCountsForFeed(database, customId(), account_id, true));
   }
-
+  
   setCountOfUnreadMessages(DatabaseQueries::getMessageCountsForFeed(database, customId(), account_id, false));
 }
 
@@ -142,23 +145,25 @@ void Feed::run() {
   qDebug().nospace() << "Downloading new messages for feed "
                      << customId() << " in thread: \'"
                      << QThread::currentThreadId() << "\'.";
-
+  
   QList<Message> msgs = obtainNewMessages();
   emit messagesObtained(msgs);
 }
 
 int Feed::updateMessages(const QList<Message> &messages) {
-  qDebug().nospace() << "Updating messages in DB. Main thread: " <<
+  bool is_main_thread = QThread::currentThread() == qApp->thread();
-                        (QThread::currentThread() == qApp->thread() ? "true." : "false.");
 
+  qDebug("Updating messages in DB. Main thread: '%s'.", qPrintable(is_main_thread ? "true." : "false."));
+  
   int custom_id = customId();
   int account_id = getParentServiceRoot()->accountId();
   bool anything_updated = false;
   bool ok;
-  QSqlDatabase database = qApp->database()->connection(metaObject()->className(), DatabaseFactory::FromSettings);
+  QSqlDatabase database = is_main_thread ?
-  int updated_messages = DatabaseQueries::updateMessages(database, messages, custom_id, account_id, url(),
+                            qApp->database()->connection(metaObject()->className(), DatabaseFactory::FromSettings) :
-                                                         &anything_updated, &ok);
+                            qApp->database()->connection(QSL("feed_upd"), DatabaseFactory::FromSettings);
-
+  int updated_messages = DatabaseQueries::updateMessages(database, messages, custom_id, account_id, url(), &anything_updated, &ok);
+  
   if (ok) {
     if (updated_messages > 0) {
       setStatus(NewMessages);
@@ -166,19 +171,19 @@ int Feed::updateMessages(const QList<Message> &messages) {
     else {
       setStatus(Normal);
     }
-
+    
     QList<RootItem*> items_to_update;
-
+    
     updateCounts(true);
     items_to_update.append(this);
-
+    
     if (getParentServiceRoot()->recycleBin() != nullptr && anything_updated) {
       getParentServiceRoot()->recycleBin()->updateCounts(true);
       items_to_update.append(getParentServiceRoot()->recycleBin());
     }
-
+    
     getParentServiceRoot()->itemChanged(items_to_update);
   }
-
+  
   return updated_messages;
 }

src/services/abstract/recyclebin.cpp

@@ -23,6 +23,8 @@
 #include "miscellaneous/databasequeries.h"
 #include "services/abstract/serviceroot.h"
 
+#include <QThread>
+
 
 RecycleBin::RecycleBin(RootItem *parent_item) : RootItem(parent_item), m_totalCount(0),
   m_unreadCount(0), m_contextMenu(QList<QAction*>()) {
@@ -46,7 +48,10 @@ int RecycleBin::countOfAllMessages() const {
 }
 
 void RecycleBin::updateCounts(bool update_total_count) {
-  QSqlDatabase database = qApp->database()->connection(metaObject()->className(), DatabaseFactory::FromSettings);
+  bool is_main_thread = QThread::currentThread() == qApp->thread();
+  QSqlDatabase database = is_main_thread ?
+                            qApp->database()->connection(metaObject()->className(), DatabaseFactory::FromSettings) :
+                            qApp->database()->connection(QSL("feed_upd"), DatabaseFactory::FromSettings);
 
   m_unreadCount = DatabaseQueries::getMessageCountsForBin(database, getParentServiceRoot()->accountId(), false);