d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-11 15:27:54 +00:00
Code Issues Projects Releases Wiki Activity

Correctly handle Auto TMM in Torrent Files Watcher

Browse Source 
PR #13690.
This commit is contained in:
Vladimir Golovnev 2022-01-11 07:25:30 +03:00 committed by GitHub
parent 84a8158aa2
commit d39c6bef4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/base/torrentfileswatcher.cpp
View File

@ -511,7 +511,8 @@ void TorrentFilesWatcher::Worker::processFolder(const QString &path, const QStri
if (path != watchedFolderPath) if (path != watchedFolderPath)
{ {
const QString subdirPath = watchedDir.relativeFilePath(path); const QString subdirPath = watchedDir.relativeFilePath(path);
if (addTorrentParams.useAutoTMM) const bool useAutoTMM = addTorrentParams.useAutoTMM.value_or(!BitTorrent::Session::instance()->isAutoTMMDisabledByDefault());
if (useAutoTMM)
{ {
addTorrentParams.category = addTorrentParams.category.isEmpty() addTorrentParams.category = addTorrentParams.category.isEmpty()
? subdirPath : (addTorrentParams.category + QLatin1Char('/') + subdirPath); ? subdirPath : (addTorrentParams.category + QLatin1Char('/') + subdirPath);
@ -590,7 +591,8 @@ void TorrentFilesWatcher::Worker::processFailedTorrents()
if (exactDirPath != dir.path()) if (exactDirPath != dir.path())
{ {
const QString subdirPath = dir.relativeFilePath(exactDirPath); const QString subdirPath = dir.relativeFilePath(exactDirPath);
if (addTorrentParams.useAutoTMM) const bool useAutoTMM = addTorrentParams.useAutoTMM.value_or(!BitTorrent::Session::instance()->isAutoTMMDisabledByDefault());
if (useAutoTMM)
{ {
addTorrentParams.category = addTorrentParams.category.isEmpty() addTorrentParams.category = addTorrentParams.category.isEmpty()
? subdirPath : (addTorrentParams.category + QLatin1Char('/') + subdirPath); ? subdirPath : (addTorrentParams.category + QLatin1Char('/') + subdirPath);