github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-21 13:53:37 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix .torrent file could not be deleted when torrent is canceled

Browse source 
PR #21735.
Closes #21723.
This commit is contained in:
Vladimir Golovnev 2024-11-02 16:41:05 +03:00 • committed by Vladimir Golovnev (Glassez)
commit 6079b25419
No known key found for this signature in database
GPG key ID: 52A2C7DEE2DFA6F7
5 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/base/addtorrentmanager.cpp
View file

@ -195,11 +195,9 @@ void AddTorrentManager::setTorrentFileGuard(const QString &source, std::shared_p
m_guardedTorrentFiles.emplace(source, std::move(torrentFileGuard)); m_guardedTorrentFiles.emplace(source, std::move(torrentFileGuard));
} }
void AddTorrentManager::releaseTorrentFileGuard(const QString &source) std::shared_ptr<TorrentFileGuard> AddTorrentManager::releaseTorrentFileGuard(const QString &source)
{ {
auto torrentFileGuard = m_guardedTorrentFiles.take(source); return m_guardedTorrentFiles.take(source);
if (torrentFileGuard)
torrentFileGuard->setAutoRemove(false);
} }
bool AddTorrentManager::processTorrent(const QString &source, const BitTorrent::TorrentDescriptor &torrentDescr bool AddTorrentManager::processTorrent(const QString &source, const BitTorrent::TorrentDescriptor &torrentDescr

2
src/base/addtorrentmanager.h
View file

@ -74,7 +74,7 @@ protected:
void handleAddTorrentFailed(const QString &source, const QString &reason); void handleAddTorrentFailed(const QString &source, const QString &reason);
void handleDuplicateTorrent(const QString &source, const BitTorrent::TorrentDescriptor &torrentDescr, BitTorrent::Torrent *existingTorrent); void handleDuplicateTorrent(const QString &source, const BitTorrent::TorrentDescriptor &torrentDescr, BitTorrent::Torrent *existingTorrent);
void setTorrentFileGuard(const QString &source, std::shared_ptr<TorrentFileGuard> torrentFileGuard); void setTorrentFileGuard(const QString &source, std::shared_ptr<TorrentFileGuard> torrentFileGuard);
void releaseTorrentFileGuard(const QString &source); std::shared_ptr<TorrentFileGuard> releaseTorrentFileGuard(const QString &source);
private: private:
void onDownloadFinished(const Net::DownloadResult &result); void onDownloadFinished(const Net::DownloadResult &result);

2
src/gui/addnewtorrentdialog.cpp
View file

@ -821,6 +821,8 @@ void AddNewTorrentDialog::reject()
if (!m_currentContext) [[unlikely]] if (!m_currentContext) [[unlikely]]
return; return;
emit torrentRejected(m_currentContext->torrentDescr);
const BitTorrent::TorrentDescriptor &torrentDescr = m_currentContext->torrentDescr; const BitTorrent::TorrentDescriptor &torrentDescr = m_currentContext->torrentDescr;
const bool hasMetadata = torrentDescr.info().has_value(); const bool hasMetadata = torrentDescr.info().has_value();
if (!hasMetadata) if (!hasMetadata)

1
src/gui/addnewtorrentdialog.h
View file

@ -66,6 +66,7 @@ public:
signals: signals:
void torrentAccepted(const BitTorrent::TorrentDescriptor &torrentDescriptor, const BitTorrent::AddTorrentParams &addTorrentParams); void torrentAccepted(const BitTorrent::TorrentDescriptor &torrentDescriptor, const BitTorrent::AddTorrentParams &addTorrentParams);
void torrentRejected(const BitTorrent::TorrentDescriptor &torrentDescriptor);
private slots: private slots:
void updateDiskSpaceLabel(); void updateDiskSpaceLabel();

19
src/gui/guiaddtorrentmanager.cpp
View file

@ -235,15 +235,22 @@ bool GUIAddTorrentManager::processTorrent(const QString &source
dlg->setAttribute(Qt::WA_DeleteOnClose); dlg->setAttribute(Qt::WA_DeleteOnClose);
m_dialogs[infoHash] = dlg; m_dialogs[infoHash] = dlg;
connect(dlg, &AddNewTorrentDialog::torrentAccepted, this connect(dlg, &AddNewTorrentDialog::torrentAccepted, this
, [this, source](const BitTorrent::TorrentDescriptor &torrentDescr, const BitTorrent::AddTorrentParams &addTorrentParams) , [this, source, dlg](const BitTorrent::TorrentDescriptor &torrentDescr, const BitTorrent::AddTorrentParams &addTorrentParams)
{
addTorrentToSession(source, torrentDescr, addTorrentParams);
});
connect(dlg, &QDialog::finished, this, [this, source, infoHash, dlg]
{ {
if (dlg->isDoNotDeleteTorrentChecked()) if (dlg->isDoNotDeleteTorrentChecked())
releaseTorrentFileGuard(source); {
if (auto torrentFileGuard = releaseTorrentFileGuard(source))
torrentFileGuard->setAutoRemove(false);
}
addTorrentToSession(source, torrentDescr, addTorrentParams);
});
connect(dlg, &AddNewTorrentDialog::torrentRejected, this, [this, source]
{
releaseTorrentFileGuard(source);
});
connect(dlg, &QDialog::finished, this, [this, source, infoHash]
{
m_dialogs.remove(infoHash); m_dialogs.remove(infoHash);
}); });