mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-12-27 18:28:18 +03:00
Code Issues Projects Releases Packages Wiki Activity

Improve Torrent files watcher internals

Browse source 
PR #19924.
This commit is contained in:
Vladimir Golovnev 2023-11-13 14:27:04 +03:00 committed by Vladimir Golovnev (Glassez)
parent bfa8dc7f67
commit a57b80c7e0
No known key found for this signature in database
GPG key ID: 52A2C7DEE2DFA6F7
2 changed files with 9 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/base/torrentfileswatcher.cpp
View file

@ -92,7 +92,7 @@ class TorrentFilesWatcher::Worker final : public QObject
Q_DISABLE_COPY_MOVE(Worker) Q_DISABLE_COPY_MOVE(Worker)
public: public:
Worker(); Worker(QFileSystemWatcher *watcher);
public slots: public slots:
void setWatchedFolder(const Path &path, const TorrentFilesWatcher::WatchedFolderOptions &options); void setWatchedFolder(const Path &path, const TorrentFilesWatcher::WatchedFolderOptions &options);
@ -143,36 +143,16 @@ TorrentFilesWatcher *TorrentFilesWatcher::instance()
TorrentFilesWatcher::TorrentFilesWatcher(QObject *parent) TorrentFilesWatcher::TorrentFilesWatcher(QObject *parent)
: QObject(parent) : QObject(parent)
, m_ioThread {new QThread} , 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::magnetFound, this, &TorrentFilesWatcher::onMagnetFound);
connect(m_asyncWorker, &TorrentFilesWatcher::Worker::torrentFound, this, &TorrentFilesWatcher::onTorrentFound); connect(m_asyncWorker, &TorrentFilesWatcher::Worker::torrentFound, this, &TorrentFilesWatcher::onTorrentFound);
m_asyncWorker->moveToThread(m_ioThread.get()); 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(); m_ioThread->start();
for (auto it = m_watchedFolders.cbegin(); it != m_watchedFolders.cend(); ++it) load();
{
QMetaObject::invokeMethod(m_asyncWorker, [this, path = it.key(), options = it.value()]()
{
m_asyncWorker->setWatchedFolder(path, options);
});
}
} }
void TorrentFilesWatcher::load() void TorrentFilesWatcher::load()
@ -303,13 +283,10 @@ void TorrentFilesWatcher::doSetWatchedFolder(const Path &path, const WatchedFold
m_watchedFolders[path] = options; 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); emit watchedFolderSet(path, options);
} }
@ -344,8 +321,8 @@ void TorrentFilesWatcher::onTorrentFound(const BitTorrent::TorrentInfo &torrentI
BitTorrent::Session::instance()->addTorrent(torrentInfo, addTorrentParams); BitTorrent::Session::instance()->addTorrent(torrentInfo, addTorrentParams);
} }
TorrentFilesWatcher::Worker::Worker() TorrentFilesWatcher::Worker::Worker(QFileSystemWatcher *watcher)
: m_watcher {new QFileSystemWatcher(this)} : m_watcher {watcher}
, m_watchTimer {new QTimer(this)} , m_watchTimer {new QTimer(this)}
, m_retryTorrentTimer {new QTimer(this)} , m_retryTorrentTimer {new QTimer(this)}
{ {

1
src/base/torrentfileswatcher.h
View file

@ -78,7 +78,6 @@ private slots:
private: private:
explicit TorrentFilesWatcher(QObject *parent = nullptr); explicit TorrentFilesWatcher(QObject *parent = nullptr);
void initWorker();
void load(); void load();
void loadLegacy(); void loadLegacy();
void store() const; void store() const;