some enhancements to notifications and database behavior

Author: martinrotter

src/librssguard/core/messagesproxymodel.cpp

@@ -109,7 +109,8 @@ void MessagesProxyModel::initializeFilters() {
   };
 
   m_filters[MessageListFilter::ShowOnlyWithScore] = [this](int msg_row_index) {
-    const int msg_score = m_sourceModel->data(msg_row_index, MSG_MDL_SCORE_INDEX, Qt::ItemDataRole::EditRole).toDouble();
+    const int msg_score =
+      m_sourceModel->data(msg_row_index, MSG_MDL_SCORE_INDEX, Qt::ItemDataRole::EditRole).toDouble();
 
     return msg_score > MSG_SCORE_MIN;
   };
@@ -148,21 +149,6 @@ QModelIndex MessagesProxyModel::getNextPreviousUnreadItemIndex(int default_row)
   return next_index;
 }
 
-QModelIndex MessagesProxyModel::indexFromMessage(const Message& msg) const {
-  for (int i = 0; i < rowCount(); i++) {
-    auto idx = index(i, 0);
-    auto id =
-      m_sourceModel->data(m_sourceModel->index(mapToSource(idx).row(), MSG_MDL_ID_INDEX), Qt::ItemDataRole::EditRole)
-        .toInt();
-
-    if (id == msg.m_id) {
-      return idx;
-    }
-  }
-
-  return QModelIndex();
-}
-
 QModelIndex MessagesProxyModel::getNextUnreadItemIndex(int default_row, int max_row) const {
   while (default_row <= max_row) {
     // Get info if the message is read or not.

src/librssguard/core/messagesproxymodel.h

@@ -34,8 +34,6 @@ class MessagesProxyModel : public QSortFilterProxyModel {
 
     QModelIndex getNextPreviousUnreadItemIndex(int default_row) const;
 
-    QModelIndex indexFromMessage(const Message& msg) const;
-
     // Maps list of indexes.
     QModelIndexList mapListToSource(const QModelIndexList& indexes) const;
     QModelIndexList mapListFromSource(const QModelIndexList& indexes, bool deep = false) const;

src/librssguard/database/databasedriver.cpp

@@ -5,6 +5,7 @@
 #include "database/sqlquery.h"
 #include "definitions/definitions.h"
 #include "exceptions/applicationexception.h"
+#include "exceptions/sqlexception.h"
 #include "gui/messagebox.h"
 #include "miscellaneous/iofactory.h"
 #include "miscellaneous/thread.h"
@@ -132,7 +133,8 @@ void DatabaseDriver::updateDatabaseSchema(QSqlDatabase& db, const QString& datab
     int installed_db_schema = query_db.value(0).toString().toInt();
 
     if (installed_db_schema < lowest_version) {
-      throw ApplicationException(tr("this database file cannot be used because it comes from old major app version"));
+      throw SqlException(SqlException::Type::TooOldIncompatibleDbSchema,
+                         tr("this database file cannot be used because it comes from old major app version"));
     }
 
     if (installed_db_schema > current_version) {

src/librssguard/database/databasefactory.cpp

@@ -47,12 +47,13 @@ void DatabaseFactory::determineDriver() {
     qCriticalNN << LOGSEC_DB << "Failed to reach connection to DB source:" << QUOTE_W_SPACE_DOT(ex.message());
 
     if (m_dbDriver->driverType() != DatabaseDriver::DriverType::SQLite) {
-      MsgBox::show(nullptr,
-                   QMessageBox::Icon::Critical,
-                   tr("Cannot connect to database"),
-                   tr("Connection to your database was not established with error: %1. "
-                      "Falling back to SQLite.")
-                     .arg(ex.message()));
+      MsgBox::
+        show(nullptr,
+             QMessageBox::Icon::Critical,
+             tr("Cannot connect to database"),
+             tr("Connection to your database was not established with error: %1. \n\nMaybe change used database name "
+                "in settings and try again. Falling back to SQLite.")
+               .arg(ex.message()));
 
       m_dbDriver = qlinq::from(m_allDbDrivers).first([](DatabaseDriver* driv) {
         return driv->driverType() == DatabaseDriver::DriverType::SQLite;

src/librssguard/definitions/definitions.h

@@ -103,7 +103,7 @@
 #define MAX_NUMBER_OF_REDIRECTIONS   4
 
 #define NOTIFICATIONS_MARGIN       16
-#define NOTIFICATIONS_WIDTH        300
+#define NOTIFICATIONS_WIDTH        350
 #define NOTIFICATIONS_TIMEOUT      10s
 #define NOTIFICATION_SHORT_TIMEOUT 3s
 #define NOTIFICATIONS_PAGE_SIZE    10

src/librssguard/exceptions/sqlexception.cpp

@@ -4,8 +4,10 @@
 
 #include "definitions/definitions.h"
 
+SqlException::SqlException(Type type, const QString& message) : ApplicationException(message), m_type(type) {}
+
 SqlException::SqlException(const QSqlError& error, const QString& file, int line)
-  : ApplicationException(messageForError(error), file, line) {}
+  : ApplicationException(messageForError(error), file, line), m_type(Type::GeneralError) {}
 
 QString SqlException::messageForError(const QSqlError& error) const {
   if (!error.isValid()) {
@@ -21,3 +23,11 @@ QString SqlException::messageForError(const QSqlError& error) const {
     return QSL("%1/%2").arg(error_code, error.text());
   }
 }
+
+SqlException::Type SqlException::type() const {
+  return m_type;
+}
+
+void SqlException::setType(Type type) {
+  m_type = type;
+}

src/librssguard/exceptions/sqlexception.h

@@ -9,10 +9,21 @@
 
 class RSSGUARD_DLLSPEC SqlException : public ApplicationException {
   public:
+    enum class Type {
+      GeneralError,
+      TooOldIncompatibleDbSchema
+    };
+
+    explicit SqlException(Type type, const QString& message = {});
     explicit SqlException(const QSqlError& error, const QString& file = QString(), int line = 0);
 
+    Type type() const;
+    void setType(Type type);
+
   private:
     QString messageForError(const QSqlError& error) const;
+
+    Type m_type;
 };
 
 #endif // SQLEXCEPTION_H

src/librssguard/gui/feedmessageviewer.cpp

@@ -256,10 +256,12 @@ void FeedMessageViewer::loadMessageToFeedAndArticleList(Feed* feed, const Messag
 
   m_feedsView->setExpanded(idx_map, true);
   m_feedsView->setCurrentIndex(idx_map);
+
   QCoreApplication::processEvents();
 
-  auto idx_map_msg = m_messagesView->model()->indexFromMessage(message);
-  auto msg_is_visible = !m_messagesView->isRowHidden(idx_map_msg.row(), idx_map_msg);
+  auto idx_map_msg =
+    m_messagesView->model()->mapFromSource(m_messagesView->sourceModel()->indexForMessage(message.m_id));
+  auto msg_is_visible = !m_messagesView->isRowHidden(idx_map_msg.row(), QModelIndex());
 
   if (!idx_map_msg.isValid() || !msg_is_visible) {
     qApp->showGuiMessage(Notification::Event::GeneralEvent,
@@ -272,6 +274,7 @@ void FeedMessageViewer::loadMessageToFeedAndArticleList(Feed* feed, const Messag
   }
 
   m_messagesView->setCurrentIndex(idx_map_msg);
+  m_messagesView->scrollTo(idx_map_msg, QAbstractItemView::ScrollHint::PositionAtCenter);
 }
 
 void FeedMessageViewer::onMessageRemoved(RootItem* root) {

src/librssguard/gui/notifications/articlelistnotification.cpp

@@ -88,7 +88,7 @@ void ArticleListNotification::loadResults(const QHash<Feed*, QList<Message>>& ne
     }
 
     if (m_newMessages[fd].size() > 0) {
-      m_ui.m_cmbFeeds->addItem(fd->sanitizedTitle(), QVariant::fromValue(fd));
+      m_ui.m_cmbFeeds->addItem(fd->fullIcon(), fd->sanitizedTitle(), QVariant::fromValue(fd));
     }
   }