From a57b80c7e0bc16dc004f01a82477f338252dc1e7 Mon Sep 17 00:00:00 2001
From: Vladimir Golovnev <glassez@yandex.ru>
Date: Mon, 13 Nov 2023 14:27:04 +0300
Subject: [PATCH] Improve Torrent files watcher internals

PR #19924.
---
 src/base/torrentfileswatcher.cpp | 41 +++++++-------------------------
 src/base/torrentfileswatcher.h   |  1 -
 2 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/src/base/torrentfileswatcher.cpp b/src/base/torrentfileswatcher.cpp
index 2af5cd276..66ec9a566 100644
--- a/src/base/torrentfileswatcher.cpp
+++ b/src/base/torrentfileswatcher.cpp
@@ -92,7 +92,7 @@ class TorrentFilesWatcher::Worker final : public QObject
     Q_DISABLE_COPY_MOVE(Worker)
 
 public:
-    Worker();
+    Worker(QFileSystemWatcher *watcher);
 
 public slots:
     void setWatchedFolder(const Path &path, const TorrentFilesWatcher::WatchedFolderOptions &options);
@@ -143,36 +143,16 @@ TorrentFilesWatcher *TorrentFilesWatcher::instance()
 TorrentFilesWatcher::TorrentFilesWatcher(QObject *parent)
     : QObject(parent)
     , m_ioThread {new QThread}
+    , m_asyncWorker {new TorrentFilesWatcher::Worker(new QFileSystemWatcher(this))}
 {
-    const auto *btSession = BitTorrent::Session::instance();
-    if (btSession->isRestored())
-        initWorker();
-    else
-        connect(btSession, &BitTorrent::Session::restored, this, &TorrentFilesWatcher::initWorker);
-
-    load();
-}
-
-void TorrentFilesWatcher::initWorker()
-{
-    Q_ASSERT(!m_asyncWorker);
-
-    m_asyncWorker = new TorrentFilesWatcher::Worker;
-
     connect(m_asyncWorker, &TorrentFilesWatcher::Worker::magnetFound, this, &TorrentFilesWatcher::onMagnetFound);
     connect(m_asyncWorker, &TorrentFilesWatcher::Worker::torrentFound, this, &TorrentFilesWatcher::onTorrentFound);
 
     m_asyncWorker->moveToThread(m_ioThread.get());
-    connect(m_ioThread.get(), &QObject::destroyed, this, [this] { delete m_asyncWorker; });
+    connect(m_ioThread.get(), &QThread::finished, m_asyncWorker, &QObject::deleteLater);
     m_ioThread->start();
 
-    for (auto it = m_watchedFolders.cbegin(); it != m_watchedFolders.cend(); ++it)
-    {
-        QMetaObject::invokeMethod(m_asyncWorker, [this, path = it.key(), options = it.value()]()
-        {
-            m_asyncWorker->setWatchedFolder(path, options);
-        });
-    }
+    load();
 }
 
 void TorrentFilesWatcher::load()
@@ -303,13 +283,10 @@ void TorrentFilesWatcher::doSetWatchedFolder(const Path &path, const WatchedFold
 
     m_watchedFolders[path] = options;
 
-    if (m_asyncWorker)
+    QMetaObject::invokeMethod(m_asyncWorker, [this, path, options]
     {
-        QMetaObject::invokeMethod(m_asyncWorker, [this, path, options]()
-        {
-            m_asyncWorker->setWatchedFolder(path, options);
-        });
-    }
+        m_asyncWorker->setWatchedFolder(path, options);
+    });
 
     emit watchedFolderSet(path, options);
 }
@@ -344,8 +321,8 @@ void TorrentFilesWatcher::onTorrentFound(const BitTorrent::TorrentInfo &torrentI
     BitTorrent::Session::instance()->addTorrent(torrentInfo, addTorrentParams);
 }
 
-TorrentFilesWatcher::Worker::Worker()
-    : m_watcher {new QFileSystemWatcher(this)}
+TorrentFilesWatcher::Worker::Worker(QFileSystemWatcher *watcher)
+    : m_watcher {watcher}
     , m_watchTimer {new QTimer(this)}
     , m_retryTorrentTimer {new QTimer(this)}
 {
diff --git a/src/base/torrentfileswatcher.h b/src/base/torrentfileswatcher.h
index be7f42ce9..9142679f3 100644
--- a/src/base/torrentfileswatcher.h
+++ b/src/base/torrentfileswatcher.h
@@ -78,7 +78,6 @@ private slots:
 private:
     explicit TorrentFilesWatcher(QObject *parent = nullptr);
 
-    void initWorker();
     void load();
     void loadLegacy();
     void store() const;