d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-23 21:14:33 +00:00
Code Issues Projects Releases Wiki Activity

Better reporting of success/failure of torrent and file deletion.

Browse Source
This commit is contained in:
sledgehammer999 2017-09-14 19:55:14 +03:00
parent d165da9c6c
commit 8f16388915
No known key found for this signature in database
GPG Key ID: 6E4A2D025B7CC9A2
2 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/base/bittorrent/session.cpp
View File

@ -1837,13 +1837,16 @@ bool Session::deleteTorrent(const QString &hash, bool deleteLocalFiles)
QString rootPath = torrent->rootPath(true);
if (!rootPath.isEmpty())
// torrent with root folder
m_savePathsToRemove[torrent->hash()] = rootPath;
m_removingTorrents[torrent->hash()] = {torrent->name(), rootPath, deleteLocalFiles};
else if (torrent->useTempPath())
// torrent without root folder still has it in its temporary save path
m_savePathsToRemove[torrent->hash()] = torrent->savePath(true);
m_removingTorrents[torrent->hash()] = {torrent->name(), torrent->savePath(true), deleteLocalFiles};
else
m_removingTorrents[torrent->hash()] = {torrent->name(), "", deleteLocalFiles};
m_nativeSession->remove_torrent(torrent->nativeHandle(), libt::session::delete_files);
}
else {
m_removingTorrents[torrent->hash()] = {torrent->name(), "", deleteLocalFiles};
QStringList unwantedFiles;
if (torrent->hasMetadata())
unwantedFiles = torrent->absoluteFilePathsUnwanted();
@ -1870,11 +1873,6 @@ bool Session::deleteTorrent(const QString &hash, bool deleteLocalFiles)
foreach (const QString &file, files)
Utils::Fs::forceRemove(resumeDataDir.absoluteFilePath(file));
if (deleteLocalFiles)
Logger::instance()->addMessage(tr("'%1' was removed from transfer list and hard disk.", "'xxx.avi' was removed...").arg(torrent->name()));
else
Logger::instance()->addMessage(tr("'%1' was removed from transfer list.", "'xxx.avi' was removed...").arg(torrent->name()));
delete torrent;
qDebug("Torrent deleted.");
return true;
@ -3984,18 +3982,38 @@ void Session::handleTorrentRemovedAlert(libt::torrent_removed_alert *p)
{
if (m_loadedMetadata.contains(p->info_hash))
emit metadataLoaded(m_loadedMetadata.take(p->info_hash));
if (m_removingTorrents.contains(p->info_hash)) {
const RemovingTorrentData tmpRemovingTorrentData = m_removingTorrents[p->info_hash];
if (!tmpRemovingTorrentData.requestedFileDeletion) {
LogMsg(tr("'%1' was removed from the transfer list.", "'xxx.avi' was removed...").arg(tmpRemovingTorrentData.name));
m_removingTorrents.remove(p->info_hash);
}
}
}
void Session::handleTorrentDeletedAlert(libt::torrent_deleted_alert *p)
{
Utils::Fs::smartRemoveEmptyFolderTree(m_savePathsToRemove.take(p->info_hash));
if (!m_removingTorrents.contains(p->info_hash))
return;
const RemovingTorrentData tmpRemovingTorrentData = m_removingTorrents.take(p->info_hash);
Utils::Fs::smartRemoveEmptyFolderTree(tmpRemovingTorrentData.savePathToRemove);
LogMsg(tr("'%1' was removed from the transfer list and hard disk.", "'xxx.avi' was removed...").arg(tmpRemovingTorrentData.name));
}
void Session::handleTorrentDeleteFailedAlert(libt::torrent_delete_failed_alert *p)
{
if (!m_removingTorrents.contains(p->info_hash))
return;
const RemovingTorrentData tmpRemovingTorrentData = m_removingTorrents.take(p->info_hash);
// libtorrent won't delete the directory if it contains files not listed in the torrent,
// so we remove the directory ourselves
Utils::Fs::smartRemoveEmptyFolderTree(m_savePathsToRemove.take(p->info_hash));
Utils::Fs::smartRemoveEmptyFolderTree(tmpRemovingTorrentData.savePathToRemove);
LogMsg(tr("'%1' was removed from the transfer list but the files couldn't be deleted. Error: %2", "'xxx.avi' was removed...")
.arg(tmpRemovingTorrentData.name)
.arg(QString::fromLocal8Bit(p->error.message().c_str())), Log::CRITICAL);
}
void Session::handleMetadataReceivedAlert(libt::metadata_received_alert *p)

9
src/base/bittorrent/session.h
View File

@ -536,6 +536,13 @@ namespace BitTorrent
void networkConfigurationChange(const QNetworkConfiguration&);
private:
struct RemovingTorrentData
{
QString name;
QString savePathToRemove;
bool requestedFileDeletion;
};
explicit Session(QObject *parent = 0);
~Session();
@ -705,7 +712,6 @@ namespace BitTorrent
QList<BitTorrent::TrackerEntry> m_additionalTrackerList;
QString m_resumeFolderPath;
QFile m_resumeFolderLock;
QHash<InfoHash, QString> m_savePathsToRemove;
bool m_useProxy;
QTimer *m_refreshTimer;
@ -725,6 +731,7 @@ namespace BitTorrent
QHash<InfoHash, TorrentHandle *> m_torrents;
QHash<InfoHash, AddTorrentData> m_addingTorrents;
QHash<QString, AddTorrentParams> m_downloadedTorrents;
QHash<InfoHash, RemovingTorrentData> m_removingTorrents;
TorrentStatusReport m_torrentStatusReport;
QStringMap m_categories;
QSet<QString> m_tags;