github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-19 12:59:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #14116 from glassez/drop-move-notify

Browse source 
Drop notification about move storage finished
This commit is contained in:
Vladimir Golovnev 2021-01-02 10:34:09 +03:00 • committed by GitHub
commit 7c02630186
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/base/bittorrent/session.cpp
View file

@ -4928,9 +4928,6 @@ void Session::handleStorageMovedAlert(const lt::storage_moved_alert *p)
const QString torrentName = (torrent ? torrent->name() : QString {infoHash}); const QString torrentName = (torrent ? torrent->name() : QString {infoHash});
LogMsg(tr("\"%1\" is successfully moved to \"%2\".").arg(torrentName, newPath)); LogMsg(tr("\"%1\" is successfully moved to \"%2\".").arg(torrentName, newPath));
if (torrent)
emit torrentStorageMoveFinished(torrent, newPath);
handleMoveTorrentStorageJobFinished(); handleMoveTorrentStorageJobFinished();
} }
@ -4949,9 +4946,6 @@ void Session::handleStorageMovedFailedAlert(const lt::storage_moved_failed_alert
LogMsg(tr("Failed to move \"%1\" from \"%2\" to \"%3\". Reason: %4.") LogMsg(tr("Failed to move \"%1\" from \"%2\" to \"%3\". Reason: %4.")
.arg(torrentName, currentLocation, currentJob.path, errorMessage), Log::CRITICAL); .arg(torrentName, currentLocation, currentJob.path, errorMessage), Log::CRITICAL);
if (torrent)
emit torrentStorageMoveFailed(torrent, currentJob.path, errorMessage);
handleMoveTorrentStorageJobFinished(); handleMoveTorrentStorageJobFinished();
} }

2
src/base/bittorrent/session.h
View file

@ -524,8 +524,6 @@ namespace BitTorrent
void torrentResumed(TorrentHandle *torrent); void torrentResumed(TorrentHandle *torrent);
void torrentSavePathChanged(TorrentHandle *torrent); void torrentSavePathChanged(TorrentHandle *torrent);
void torrentSavingModeChanged(TorrentHandle *torrent); void torrentSavingModeChanged(TorrentHandle *torrent);
void torrentStorageMoveFailed(TorrentHandle *torrent, const QString &targetPath, const QString &error);
void torrentStorageMoveFinished(TorrentHandle *torrent, const QString &newPath);
void torrentsUpdated(const QVector<TorrentHandle *> &torrents); void torrentsUpdated(const QVector<TorrentHandle *> &torrents);
void torrentTagAdded(TorrentHandle *torrent, const QString &tag); void torrentTagAdded(TorrentHandle *torrent, const QString &tag);
void torrentTagRemoved(TorrentHandle *torrent, const QString &tag); void torrentTagRemoved(TorrentHandle *torrent, const QString &tag);

12
src/gui/mainwindow.cpp
View file

@ -208,8 +208,6 @@ MainWindow::MainWindow(QWidget *parent)
connect(BitTorrent::Session::instance(), &BitTorrent::Session::downloadFromUrlFailed, this, &MainWindow::handleDownloadFromUrlFailure); connect(BitTorrent::Session::instance(), &BitTorrent::Session::downloadFromUrlFailed, this, &MainWindow::handleDownloadFromUrlFailure);
connect(BitTorrent::Session::instance(), &BitTorrent::Session::speedLimitModeChanged, this, &MainWindow::updateAltSpeedsBtn); connect(BitTorrent::Session::instance(), &BitTorrent::Session::speedLimitModeChanged, this, &MainWindow::updateAltSpeedsBtn);
connect(BitTorrent::Session::instance(), &BitTorrent::Session::recursiveTorrentDownloadPossible, this, &MainWindow::askRecursiveTorrentDownloadConfirmation); connect(BitTorrent::Session::instance(), &BitTorrent::Session::recursiveTorrentDownloadPossible, this, &MainWindow::askRecursiveTorrentDownloadConfirmation);
connect(BitTorrent::Session::instance(), &BitTorrent::Session::torrentStorageMoveFinished, this, &MainWindow::moveTorrentFinished);
connect(BitTorrent::Session::instance(), &BitTorrent::Session::torrentStorageMoveFailed, this, &MainWindow::moveTorrentFailed);
qDebug("create tabWidget"); qDebug("create tabWidget");
m_tabs = new HidableTabWidget(this); m_tabs = new HidableTabWidget(this);
@ -871,16 +869,6 @@ void MainWindow::finishedTorrent(BitTorrent::TorrentHandle *const torrent) const
showNotificationBaloon(tr("Download completion"), tr("'%1' has finished downloading.", "e.g: xxx.avi has finished downloading.").arg(torrent->name())); showNotificationBaloon(tr("Download completion"), tr("'%1' has finished downloading.", "e.g: xxx.avi has finished downloading.").arg(torrent->name()));
} }
void MainWindow::moveTorrentFinished(BitTorrent::TorrentHandle *const torrent, const QString &newPath) const
{
showNotificationBaloon(tr("Torrent moving finished"), tr("'%1' has finished moving files to '%2'.").arg(torrent->name(), newPath));
}
void MainWindow::moveTorrentFailed(BitTorrent::TorrentHandle *const torrent, const QString &targetPath, const QString &error) const
{
showNotificationBaloon(tr("Torrent moving failed"), tr("'%1' has failed moving files to '%2'. Reason: %3").arg(torrent->name(), targetPath, error));
}
// Notification when disk is full // Notification when disk is full
void MainWindow::fullDiskError(BitTorrent::TorrentHandle *const torrent, const QString &msg) const void MainWindow::fullDiskError(BitTorrent::TorrentHandle *const torrent, const QString &msg) const
{ {

2
src/gui/mainwindow.h
View file

@ -132,8 +132,6 @@ private slots:
void addTorrentFailed(const QString &error) const; void addTorrentFailed(const QString &error) const;
void torrentNew(BitTorrent::TorrentHandle *const torrent) const; void torrentNew(BitTorrent::TorrentHandle *const torrent) const;
void finishedTorrent(BitTorrent::TorrentHandle *const torrent) const; void finishedTorrent(BitTorrent::TorrentHandle *const torrent) const;
void moveTorrentFinished(BitTorrent::TorrentHandle *const torrent, const QString &newPath) const;
void moveTorrentFailed(BitTorrent::TorrentHandle *const torrent, const QString &targetPath, const QString &error) const;
void askRecursiveTorrentDownloadConfirmation(BitTorrent::TorrentHandle *const torrent); void askRecursiveTorrentDownloadConfirmation(BitTorrent::TorrentHandle *const torrent);
void optionsSaved(); void optionsSaved();
#if defined(Q_OS_WIN) || defined(Q_OS_MACOS) #if defined(Q_OS_WIN) || defined(Q_OS_MACOS)