Merge pull request #9940 from glassez/error-msg

Show error message when Session failed to start

src/app/application.cpp

@@ -44,6 +44,7 @@
 #endif
 
 #ifndef DISABLE_GUI
+#include <QMessageBox>
 #ifdef Q_OS_WIN
 #include <QSessionManager>
 #include <QSharedMemory>
@@ -61,6 +62,7 @@
 
 #include "base/bittorrent/session.h"
 #include "base/bittorrent/torrenthandle.h"
+#include "base/exceptions.h"
 #include "base/iconprovider.h"
 #include "base/logger.h"
 #include "base/net/downloadmanager.h"
@@ -495,6 +497,7 @@ int Application::exec(const QStringList &params)
     GuiIconProvider::initInstance();
 #endif
 
+    try {
         BitTorrent::Session::initInstance();
         connect(BitTorrent::Session::instance(), &BitTorrent::Session::torrentFinished, this, &Application::torrentFinished);
         connect(BitTorrent::Session::instance(), &BitTorrent::Session::allTorrentsFinished, this, &Application::allTorrentsFinished, Qt::QueuedConnection);
@@ -515,6 +518,21 @@ int Application::exec(const QStringList &params)
 
         new RSS::Session; // create RSS::Session singleton
         new RSS::AutoDownloader; // create RSS::AutoDownloader singleton
+    }
+    catch (const RuntimeError &err) {
+#ifdef DISABLE_GUI
+        fprintf(stderr, "%s", err.what());
+#else
+        QMessageBox msgBox;
+        msgBox.setIcon(QMessageBox::Critical);
+        msgBox.setText(tr("Application failed to start."));
+        msgBox.setInformativeText(err.message());
+        msgBox.show(); // Need to be shown or to moveToCenter does not work
+        msgBox.move(Utils::Misc::screenCenter(&msgBox));
+        msgBox.exec();
+#endif
+        return 1;
+    }
 
 #ifdef DISABLE_GUI
 #ifndef DISABLE_WEBUI

src/base/asyncfilestorage.cpp

@@ -38,12 +38,12 @@ AsyncFileStorage::AsyncFileStorage(const QString &storageFolderPath, QObject *pa
     , m_lockFile(m_storageDir.absoluteFilePath(QStringLiteral("storage.lock")))
 {
     if (!m_storageDir.mkpath(m_storageDir.absolutePath()))
-        throw AsyncFileStorageError(
-                QString("Could not create directory '%1'.").arg(m_storageDir.absolutePath()));
+        throw AsyncFileStorageError {tr("Could not create directory '%1'.")
+                .arg(m_storageDir.absolutePath())};
 
     // TODO: This folder locking approach does not work for UNIX systems. Implement it.
     if (!m_lockFile.open(QFile::WriteOnly))
-        throw AsyncFileStorageError(m_lockFile.errorString());
+        throw AsyncFileStorageError {m_lockFile.errorString()};
 }
 
 AsyncFileStorage::~AsyncFileStorage()
@@ -76,13 +76,3 @@ void AsyncFileStorage::store_impl(const QString &fileName, const QByteArray &dat
         }
     }
 }
-
-AsyncFileStorageError::AsyncFileStorageError(const QString &message)
-    : std::runtime_error(message.toUtf8().data())
-{
-}
-
-QString AsyncFileStorageError::message() const
-{
-    return what();
-}

src/base/asyncfilestorage.h

@@ -28,22 +28,22 @@
 
 #pragma once
 
-#include <stdexcept>
-
 #include <QDir>
 #include <QFile>
 #include <QObject>
 
-class AsyncFileStorageError : public std::runtime_error
+#include "base/exceptions.h"
+
+class AsyncFileStorageError : public RuntimeError
 {
 public:
-    explicit AsyncFileStorageError(const QString &message);
-    QString message() const;
+    using RuntimeError::RuntimeError;
 };
 
 class AsyncFileStorage : public QObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY(AsyncFileStorage)
 
 public:
     explicit AsyncFileStorage(const QString &storageFolderPath, QObject *parent = nullptr);

src/base/bittorrent/session.cpp

@@ -69,6 +69,7 @@
 #endif
 
 #include "base/algorithm.h"
+#include "base/exceptions.h"
 #include "base/global.h"
 #include "base/logger.h"
 #include "base/net/downloadhandler.h"
@@ -3817,11 +3818,11 @@ void Session::initResumeFolder()
     if (resumeFolderDir.exists() || resumeFolderDir.mkpath(resumeFolderDir.absolutePath())) {
         m_resumeFolderLock.setFileName(resumeFolderDir.absoluteFilePath("session.lock"));
         if (!m_resumeFolderLock.open(QFile::WriteOnly)) {
-            throw std::runtime_error("Cannot write to torrent resume folder.");
+            throw RuntimeError {tr("Cannot write to torrent resume folder.")};
         }
     }
     else {
-        throw std::runtime_error("Cannot create torrent resume folder.");
+        throw RuntimeError {tr("Cannot create torrent resume folder.")};
     }
 }
 

src/base/exceptions.cpp

@@ -30,11 +30,10 @@
 
 RuntimeError::RuntimeError(const QString &message)
     : std::runtime_error {message.toUtf8().data()}
-    , m_message {message}
 {
 }
 
 QString RuntimeError::message() const
 {
-    return m_message;
+    return what();
 }

src/base/exceptions.h

@@ -36,7 +36,4 @@ class RuntimeError : public std::runtime_error
 public:
     explicit RuntimeError(const QString &message = "");
     QString message() const;
-
-private:
-    const QString m_message;
 };